From 0b03dc6d4049c6bfaedcc8258ac8fcf3d37bcfeb Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew" Date: Sun, 18 Jan 2009 13:49:02 +0000 Subject: [PATCH] Erwan - font adjustments --- projects/mtg/bin/Res/graphics/simon.dat | Bin 2048 -> 2048 bytes projects/mtg/bin/Res/graphics/simon.png | Bin 2791 -> 3882 bytes projects/mtg/include/MTGDefinitions.h | 2 +- projects/mtg/src/CardGui.cpp | 4 ++-- projects/mtg/src/GameApp.cpp | 2 +- projects/mtg/src/GameStateDuel.cpp | 2 +- projects/mtg/src/GameStateMenu.cpp | 2 +- projects/mtg/src/MTGGuiPlay.cpp | 2 +- projects/mtg/src/PlayGuiObject.cpp | 4 ++-- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/mtg/bin/Res/graphics/simon.dat b/projects/mtg/bin/Res/graphics/simon.dat index 5f1321458accb4c2d149cebd9ed58d2eea67550f..76f1b8e158a53edd867c5369e950807c7d786056 100644 GIT binary patch literal 2048 zcmeIyu`7gO90%~{E?t+TOP8cex^zj>rAwD2Ns^2PgV|s(8w@6+LH+>AY>Un-1B~xVl4UVj<)b%iop8HOpnLant%8 z?(@+6DKFJ;Lszoji@Z1UY38jf8do^a6|QrOyFB2D{m<=pE%%W%epuhikI!3DuX2&A z+~79%c*HYa@qsmdGM9>Zf0rNM=bgM){dhOdHuK}UochoEANM)7&joMfJ{i~9(aev1 z$gBTe|KoYP51HiLJ$vtU=R1>1%AwW&IPQyt0tY$7VUDuQ3agyr4ClDOC8ingGU!&& qjSzaw_p+Y@EV9HAj&Yn5oa8jy`LPl0{>MJVueg2w;$P|ie}7+twnsMr literal 2048 zcmeIxOD{t~6ae74@v2v;dQ=tlT!`3+*oa6hgcUY|1qqRO29ZW1A;H4Wrgy&RUecA$ z=F6O!oO9>gnIyD^+UN*vso9W8E&N1kV~Pu0=9>MR+~J<}Bc6$0h4wVxqk7NQ6L#5` zGcR(6i(KJ4x46qg`A_7#Q1^}%zS>`}AJ3Z?FL91bT;&G0xzA&s^OhC9@r#YCAOGjI zI#2rXV*dGCKkmzz|Gob)&w)Iryj1tzyvlbr?)>q--Gr9(-aYv5RrmWNjfPOK9|Jw& zS@v^)gB)goMV2_hGN(Dqc_xfs8FZ`m9^>d_H+$K~9P=FF2uC@_aZa*XKQ^M-|JaB4 LiktWEzr4S1%JLR$=6Z_EnO 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 diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h index e847ec571..d24ba818b 100644 --- a/projects/mtg/include/MTGDefinitions.h +++ b/projects/mtg/include/MTGDefinitions.h @@ -1,7 +1,7 @@ #ifndef _MTGDEFINITION_H_ #define _MTGDEFINITION_H_ -#define DEFAULT_MAIN_FONT_SCALE 1.0 +#define DEFAULT_MAIN_FONT_SCALE 0.5 class Constants { diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 3cecc3350..1c2dda2da 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -359,7 +359,7 @@ void CardGui::Render(){ } - mFont->SetScale(1.0); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); } if (tc && tc->alreadyHasTarget(card)){ @@ -371,7 +371,7 @@ void CardGui::Render(){ } if (card->isACreature()){ - mFont->SetScale(1.0); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); char buffer[200]; sprintf(buffer, "%i/%i",card->power,card->life); renderer->FillRect(x+2,y + mHeight - 12, 25 , 12 ,ARGB(128,0,0,0)); diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index 7d5c19b46..1c87bc62c 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -99,7 +99,7 @@ void GameApp::Create() CommonRes->CreateQuad("stars", "graphics/particles.png", 64, 0, 32, 32); CommonRes->GetQuad("stars")->SetHotSpot(16,16); - CommonRes->LoadJLBFont("graphics/simon",11); + CommonRes->LoadJLBFont("graphics/simon",22); CommonRes->GetJLBFont("graphics/simon")->SetTracking(-1); CommonRes->LoadJLBFont("graphics/f3",16); CommonRes->LoadJLBFont("graphics/magic",16); diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index 446cf22c0..237508d26 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -70,7 +70,7 @@ void GameStateDuel::Start() mFont = GameApp::CommonRes->GetJLBFont("graphics/simon"); mFont->SetBase(0); // using 2nd font - opponentMenuFont = mFont; //NEW JLBFont("graphics/simon",11); + opponentMenuFont = mFont; //NEW JLBFont("graphics/simon",22); menu = NEW SimpleMenu(DUEL_MENU_GAME_MENU, this, mFont, SCREEN_WIDTH/2-100, 25); diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 6c2ac0807..39eb29ef9 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -366,7 +366,7 @@ void GameStateMenu::Render() if (mGuiController!=NULL) mGuiController->Render(); - // mFont->SetScale(0.7); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetColor(ARGB(128,255,255,255)); mFont->DrawString(GAME_VERSION, SCREEN_WIDTH-10,SCREEN_HEIGHT-15,JGETEXT_RIGHT); mFont->DrawString(nbcardsStr,10, SCREEN_HEIGHT-15); diff --git a/projects/mtg/src/MTGGuiPlay.cpp b/projects/mtg/src/MTGGuiPlay.cpp index 74f86cc84..742ea9604 100644 --- a/projects/mtg/src/MTGGuiPlay.cpp +++ b/projects/mtg/src/MTGGuiPlay.cpp @@ -308,7 +308,7 @@ void MTGGuiPlay::RenderPhaseBar(){ }else{ mFont->SetColor(ARGB(255,255,255,255)); } - mFont->SetScale(1.0); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->DrawString(Constants::MTGPhaseNames[currentPhase], 375, 0); } diff --git a/projects/mtg/src/PlayGuiObject.cpp b/projects/mtg/src/PlayGuiObject.cpp index 629cd2c7d..89b1f453e 100644 --- a/projects/mtg/src/PlayGuiObject.cpp +++ b/projects/mtg/src/PlayGuiObject.cpp @@ -46,7 +46,7 @@ void GuiAvatar::Render(){ JRenderer * r = JRenderer::GetInstance(); int life = player->life; JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT); - mFont->SetScale(1.0); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); //Avatar int lifeDiff = life - currentLife; if (lifeDiff < 0 && currentLife >0 ){ @@ -111,7 +111,7 @@ void GuiGameZone::Render(){ } //Number of cards JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT); - mFont->SetScale(1.0); + mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); char buffer[512]; sprintf(buffer,"%i", zone->nb_cards); mFont->SetColor(ARGB(128,0,0,0));