--- einstein-2.0.dfsg.2.orig/descr.cpp +++ einstein-2.0.dfsg.2/descr.cpp @@ -139,9 +139,9 @@ { currentPage = 0; //area.add(parentArea, false); - titleFont = new Font(L"nova.ttf", 26); - buttonFont = new Font(L"laudcn2.ttf", 14); - textFont = new Font(L"laudcn2.ttf", 16); + titleFont = new Font(L"DejaVuSans.ttf", 26); + buttonFont = new Font(L"DejaVuSans.ttf", 14); + textFont = new Font(L"DejaVuSans.ttf", 16); textHeight = (int)(textFont->getHeight(L"A") * 1.0); text = new TextParser(msg(L"rulesText"), *textFont, START_X, START_Y, CLIENT_WIDTH, CLIENT_HEIGHT); --- einstein-2.0.dfsg.2.orig/game.cpp +++ einstein-2.0.dfsg.2/game.cpp @@ -33,7 +33,7 @@ screen.draw(8, 10, tile); SDL_FreeSurface(tile); - Font titleFont(L"nova.ttf", 28); + Font titleFont(L"DejaVuSans.ttf", 28); titleFont.draw(screen.getSurface(), 20, 20, 255,255,0, true, msg(L"einsteinPuzzle")); @@ -89,7 +89,7 @@ { lastRun = elapsed = lastUpdate = 0; stop(); - font = new Font(L"luximb.ttf", 16); + font = new Font(L"DejaVuSans.ttf", 16); } Watch::Watch(std::istream &stream) @@ -97,7 +97,7 @@ elapsed = readInt(stream); lastUpdate = 0; stop(); - font = new Font(L"luximb.ttf", 16); + font = new Font(L"DejaVuSans.ttf", 16); } Watch::~Watch() @@ -178,7 +178,7 @@ watch->stop(); Area area; area.add(background, false); - Font font(L"laudcn2.ttf", 16); + Font font(L"DejaVuSans.ttf", 16); area.add(new Window(280, 275, 240, 50, L"greenpattern.bmp", 6)); area.add(new Label(&font, 280, 275, 240, 50, Label::ALIGN_CENTER, Label::ALIGN_MIDDLE, 255,255,0, msg(L"paused"))); @@ -209,7 +209,7 @@ virtual void doAction() { sound->play(L"applause.wav"); watch->stop(); - Font font(L"laudcn2.ttf", 20); + Font font(L"DejaVuSans.ttf", 20); showMessageWindow(gameArea, L"marble1.bmp", 500, 70, &font, 255,0,0, msg(L"won")); gameArea->draw(); @@ -257,8 +257,8 @@ sound->play(L"glasbk2.wav"); bool restart = false; bool newGame = false; - Font font(L"laudcn2.ttf", 24); - Font btnFont(L"laudcn2.ttf", 14); + Font font(L"DejaVuSans.ttf", 24); + Font btnFont(L"DejaVuSans.ttf", 14); Area area; area.add(gameArea); area.add(new Window(220, 240, 360, 140, L"redpattern.bmp", 6)); @@ -329,7 +329,7 @@ CheatCommand(Area *a) { gameArea = a; }; virtual void doAction() { - Font font(L"nova.ttf", 30); + Font font(L"DejaVuSans.ttf", 30); showMessageWindow(gameArea, L"darkpattern.bmp", 500, 100, &font, 255,255,255, msg(L"iddqd")); @@ -475,7 +475,7 @@ drawWallpaper(L"rain.bmp"); Window window(230, 260, 340, 80, L"greenpattern.bmp", 6); window.draw(); - Font font(L"laudcn2.ttf", 16); + Font font(L"DejaVuSans.ttf", 16); Label label(&font, 280, 275, 240, 50, Label::ALIGN_CENTER, Label::ALIGN_MIDDLE, 255,255,0, msg(L"loading")); label.draw(); @@ -533,7 +533,7 @@ void Game::run() { Area area; - Font btnFont(L"laudcn2.ttf", 14); + Font btnFont(L"DejaVuSans.ttf", 14); area.setTimer(300, watch); --- einstein-2.0.dfsg.2.orig/main.cpp +++ einstein-2.0.dfsg.2/main.cpp @@ -78,7 +84,7 @@ /*static void checkBetaExpire() { if (1124832535L + 60L*60L*24L*40L < time(NULL)) { - Font font(L"laudcn2.ttf", 16); + Font font(L"DejaVuSans.ttf", 16); Area area; showMessageWindow(&area, L"darkpattern.bmp", 700, 100, &font, 255,255,255, --- einstein-2.0.dfsg.2.orig/menu.cpp +++ einstein-2.0.dfsg.2/menu.cpp @@ -23,11 +23,11 @@ SDL_Surface *title = loadImage(L"nova.bmp"); screen.draw(0, 0, title); SDL_FreeSurface(title); - Font font(L"nova.ttf", 28); + Font font(L"DejaVuSans.ttf", 28); std::wstring s(msg(L"einsteinFlowix")); int width = font.getWidth(s); font.draw((screen.getWidth() - width) / 2, 30, 255,255,255, true, s); - Font urlFont(L"luximb.ttf", 16); + Font urlFont(L"DejaVuSans.ttf", 16); s = L"http://games.flowix.com"; width = urlFont.getWidth(s); urlFont.draw((screen.getWidth() - width) / 2, 60, 255,255,0, true, s); @@ -133,9 +133,9 @@ virtual void doAction() { Area area; - Font titleFont(L"nova.ttf", 26); - Font font(L"laudcn2.ttf", 14); - Font urlFont(L"luximb.ttf", 16); + Font titleFont(L"DejaVuSans.ttf", 26); + Font font(L"DejaVuSans.ttf", 14); + Font urlFont(L"DejaVuSans.ttf", 16); #define LABEL(pos, c, f, text) area.add(new Label(&f, 220, pos, 360, 20, \ Label::ALIGN_CENTER, Label::ALIGN_MIDDLE, 255,255,c, text)); @@ -171,7 +171,7 @@ void menu() { Area area; - Font font(L"laudcn2.ttf", 20); + Font font(L"DejaVuSans.ttf", 20); area.add(new MenuBackground()); area.draw(); --- einstein-2.0.dfsg.2.orig/opensave.cpp +++ einstein-2.0.dfsg.2/opensave.cpp @@ -160,7 +160,7 @@ static void showListWindow(SavesList &list, Command **commands, const std::wstring &title, Area &area, Font *font) { - Font titleFont(L"nova.ttf", 26); + Font titleFont(L"DejaVuSans.ttf", 26); area.add(new Window(250, 90, 300, 420, L"blue.bmp")); area.add(new Label(&titleFont, 250, 95, 300, 40, Label::ALIGN_CENTER, @@ -189,7 +189,7 @@ Area area; area.add(parentArea, false); - Font font(L"laudcn2.ttf", 14); + Font font(L"DejaVuSans.ttf", 14); bool saved = false; SavesList list; @@ -258,7 +258,7 @@ Area area; area.add(parentArea, false); - Font font(L"laudcn2.ttf", 14); + Font font(L"DejaVuSans.ttf", 14); Game *newGame = NULL; --- einstein-2.0.dfsg.2.orig/options.cpp +++ einstein-2.0.dfsg.2/options.cpp @@ -53,8 +53,8 @@ void showOptionsWindow(Area *parentArea) { - Font titleFont(L"nova.ttf", 26); - Font font(L"laudcn2.ttf", 14); + Font titleFont(L"DejaVuSans.ttf", 26); + Font font(L"DejaVuSans.ttf", 14); bool fullscreen = (getStorage()->get(L"fullscreen", 1) != 0); bool niceCursor = (getStorage()->get(L"niceCursor", 1) != 0); --- einstein-2.0.dfsg.2.orig/topscores.cpp +++ einstein-2.0.dfsg.2/topscores.cpp @@ -103,9 +103,9 @@ ScoresWindow::ScoresWindow(int x, int y, TopScores *scores, int highlight): Window(x, y, 320, 350, L"blue.bmp") { - Font titleFont(L"nova.ttf", 26); - Font entryFont(L"laudcn2.ttf", 14); - Font timeFont(L"luximb.ttf", 14); + Font titleFont(L"DejaVuSans.ttf", 26); + Font entryFont(L"DejaVuSans.ttf", 14); + Font timeFont(L"DejaVuSans.ttf", 14); std::wstring txt = msg(L"topScores"); int w = titleFont.getWidth(txt); @@ -139,7 +139,7 @@ { Area area; - Font font(L"laudcn2.ttf", 16); + Font font(L"DejaVuSans.ttf", 16); area.add(parentArea); area.add(new ScoresWindow(240, 125, scores, highlight)); ExitCommand exitCmd(area); @@ -154,7 +154,7 @@ { Area area; - Font font(L"laudcn2.ttf", 16); + Font font(L"DejaVuSans.ttf", 16); area.add(parentArea); area.add(new Window(170, 280, 460, 100, L"blue.bmp")); Storage *storage = getStorage(); --- einstein-2.0.dfsg.2.orig/res/resources.descr +++ einstein-2.0.dfsg.2/res/resources.descr @@ -89,13 +90,11 @@ { name = "title.bmp" } { name = "marble1.bmp" } { name = "blue.bmp" } - { name = "luximb.ttf" } { name = "redpattern.bmp" } { name = "greenpattern.bmp" } { name = "darkpattern.bmp" } { name = "nova.bmp" } - { name = "nova.ttf" } - { name = "laudcn2.ttf" } + { name = "DejaVuSans.ttf" } { name = "btn.bmp" } { name = "rules.txt", format = "messages" group = "messages" } { name = "rules_ru.txt", format = "messages" group = "messages" }