J :
* Remove the stupid effect on cards back, at least until release
This commit is contained in:
@@ -145,7 +145,7 @@ void GameApp::Create()
|
|||||||
mCurrentState = NULL;
|
mCurrentState = NULL;
|
||||||
mNextState = mGameStates[GAME_STATE_MENU];
|
mNextState = mGameStates[GAME_STATE_MENU];
|
||||||
|
|
||||||
effect = new CardEffect();
|
// effect = new CardEffect();
|
||||||
|
|
||||||
char buf[512];
|
char buf[512];
|
||||||
sprintf(buf, "size of MTGCardInstance : %i\n" , sizeof(MTGCardInstance));
|
sprintf(buf, "size of MTGCardInstance : %i\n" , sizeof(MTGCardInstance));
|
||||||
|
|||||||
@@ -328,7 +328,7 @@ void GameStateDuel::Update(float dt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mParent->effect->UpdateSmall(dt);
|
// mParent->effect->UpdateSmall(dt);
|
||||||
game->Update(dt);
|
game->Update(dt);
|
||||||
if (game->gameOver){
|
if (game->gameOver){
|
||||||
credits->compute(mPlayers[0],mPlayers[1], mParent);
|
credits->compute(mPlayers[0],mPlayers[1], mParent);
|
||||||
@@ -355,17 +355,17 @@ void GameStateDuel::Update(float dt)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DUEL_STATE_MENU:
|
case DUEL_STATE_MENU:
|
||||||
mParent->effect->UpdateSmall(dt);
|
// mParent->effect->UpdateSmall(dt);
|
||||||
menu->Update(dt);
|
menu->Update(dt);
|
||||||
break;
|
break;
|
||||||
case DUEL_STATE_CANCEL:
|
case DUEL_STATE_CANCEL:
|
||||||
mParent->effect->UpdateSmall(dt);
|
// mParent->effect->UpdateSmall(dt);
|
||||||
menu->Update(dt);
|
menu->Update(dt);
|
||||||
if (menu->closed)
|
if (menu->closed)
|
||||||
mGamePhase = DUEL_STATE_PLAY;
|
mGamePhase = DUEL_STATE_PLAY;
|
||||||
break;
|
break;
|
||||||
case DUEL_STATE_BACK_TO_MAIN_MENU:
|
case DUEL_STATE_BACK_TO_MAIN_MENU:
|
||||||
mParent->effect->UpdateSmall(dt);
|
// mParent->effect->UpdateSmall(dt);
|
||||||
menu->Update(dt);
|
menu->Update(dt);
|
||||||
if (menu->closed)
|
if (menu->closed)
|
||||||
mParent->SetNextState(GAME_STATE_MENU);
|
mParent->SetNextState(GAME_STATE_MENU);
|
||||||
|
|||||||
@@ -89,8 +89,8 @@ void GameStateShop::Destroy(){
|
|||||||
|
|
||||||
void GameStateShop::Update(float dt)
|
void GameStateShop::Update(float dt)
|
||||||
{
|
{
|
||||||
mParent->effect->UpdateSmall(dt);
|
// mParent->effect->UpdateSmall(dt);
|
||||||
mParent->effect->UpdateBig(dt);
|
// mParent->effect->UpdateBig(dt);
|
||||||
if (mStage == STAGE_SHOP_MENU){
|
if (mStage == STAGE_SHOP_MENU){
|
||||||
if (menu){
|
if (menu){
|
||||||
menu->Update(dt);
|
menu->Update(dt);
|
||||||
|
|||||||
Reference in New Issue
Block a user