diff --git a/projects/mtg/bin/Res/graphics/simon.dat b/projects/mtg/bin/Res/graphics/simon.dat index 5f1321458..76f1b8e15 100644 Binary files a/projects/mtg/bin/Res/graphics/simon.dat and b/projects/mtg/bin/Res/graphics/simon.dat differ diff --git a/projects/mtg/bin/Res/graphics/simon.png b/projects/mtg/bin/Res/graphics/simon.png index 262ae500d..e82520eee 100644 Binary files a/projects/mtg/bin/Res/graphics/simon.png and b/projects/mtg/bin/Res/graphics/simon.png differ 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));