1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 14:34:34 +00:00

Also load localized font files

This commit is contained in:
fgenesis 2012-06-18 18:54:56 +02:00
parent 98c5cefed7
commit e924a164c9

View file

@ -485,33 +485,38 @@ void DSQ::loadFonts()
destroyFonts(); destroyFonts();
font.load("data/font-small.glf", 1, false); std::string file = user.localisePath("data/font-small.glf");
font.load(file, 1, false);
font.fontTopColor = Vector(0.9,0.9,1); font.fontTopColor = Vector(0.9,0.9,1);
font.fontBtmColor = Vector(0.5,0.8,1); font.fontBtmColor = Vector(0.5,0.8,1);
font.overrideTexture = core->addTexture("font"); font.overrideTexture = core->addTexture("font");
smallFont.load("data/font-small.glf", 0.6, false); smallFont.load(file, 0.6, false);
smallFont.fontTopColor = Vector(0.9,0.9,1); smallFont.fontTopColor = Vector(0.9,0.9,1);
smallFont.fontBtmColor = Vector(0.5,0.8,1); smallFont.fontBtmColor = Vector(0.5,0.8,1);
smallFont.overrideTexture = core->addTexture("font"); smallFont.overrideTexture = core->addTexture("font");
smallFontRed.load("data/font-small.glf", 0.6, false); smallFontRed.load(file, 0.6, false);
smallFontRed.fontTopColor = Vector(1,0.9,0.9); smallFontRed.fontTopColor = Vector(1,0.9,0.9);
smallFontRed.fontBtmColor = Vector(1,0.8,0.5); smallFontRed.fontBtmColor = Vector(1,0.8,0.5);
smallFontRed.overrideTexture = core->addTexture("font"); smallFontRed.overrideTexture = core->addTexture("font");
subsFont.load("data/font-small.glf", 0.5, false); subsFont.load(file, 0.5, false);
subsFont.fontTopColor = Vector(1,1,1); subsFont.fontTopColor = Vector(1,1,1);
subsFont.fontBtmColor = Vector(0.5,0.8,1); subsFont.fontBtmColor = Vector(0.5,0.8,1);
subsFont.overrideTexture = core->addTexture("font"); subsFont.overrideTexture = core->addTexture("font");
goldFont.load("data/font-small.glf", 1, false); goldFont.load(file, 1, false);
goldFont.fontTopColor = Vector(1,0.9,0.5); goldFont.fontTopColor = Vector(1,0.9,0.5);
goldFont.fontBtmColor = Vector(0.6,0.5,0.25); goldFont.fontBtmColor = Vector(0.6,0.5,0.25);
goldFont.overrideTexture = core->addTexture("font"); goldFont.overrideTexture = core->addTexture("font");
file = user.localisePath("data/font.ttf");
debugLog("ttf..."); debugLog("ttf...");
arialFontData = (unsigned char *)readFile("data/font.ttf", &arialFontDataSize); arialFontData = (unsigned char *)readFile(file, &arialFontDataSize);
if (arialFontData) if (arialFontData)
{ {
fontArialSmall .create(arialFontData, arialFontDataSize, 12); fontArialSmall .create(arialFontData, arialFontDataSize, 12);