Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- fix issue 215
- added test for purple screen (this is the small white square on top of the loading screen)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-11-23 08:25:27 +00:00
parent e364b17117
commit 66a505969e
29 changed files with 110 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/src/GameStateShop.cpp
View File

@@ -48,9 +48,6 @@ void GameStateShop::Start()
else
mBg = NULL;
menuFont = resources.GetJLBFont(Constants::MENU_FONT);
itemFont = resources.GetJLBFont(Constants::MAIN_FONT);
JRenderer::GetInstance()->EnableVSync(true);
shop = NULL;
@@ -109,7 +106,7 @@ void GameStateShop::load(){
shop = NEW ShopItems(10, this, itemFont, 10, 0, mParent->collection, setIds);
shop = NEW ShopItems(10, this, resources.GetJLBFont(Constants::MAIN_FONT), 10, 0, mParent->collection, setIds);
MTGSetInfo * si = NULL;
for (int i = 0; i < SHOP_BOOSTERS; i++){
si = setlist.getInfo(setIds[i]);
@@ -157,7 +154,7 @@ void GameStateShop::Update(float dt)
if (menu){
menu->Update(dt);
}else{
menu = NEW SimpleMenu(11,this,menuFont,SCREEN_WIDTH/2-100,20);
menu = NEW SimpleMenu(11,this,Constants::MENU_FONT,SCREEN_WIDTH/2-100,20);
menu->Add(12,"Save & Back to Main Menu");
menu->Add(13, "Cancel");
}