- Added splash screen management
- fixed a ruling bug (putting sorcery, enchantments, etc.. into play while interrupting)
This commit is contained in:
wagic.the.homebrew
2009-03-17 11:46:39 +00:00
parent fd1c152cb3
commit 415061642d
5 changed files with 40 additions and 25 deletions

View File

@@ -49,6 +49,8 @@ GameStateDuel::GameStateDuel(GameApp* parent): GameState(parent) {
testSuite = NULL;
#endif
showMsg = 0;
unlockedTex = NULL;
unlockedQuad = NULL;
}
GameStateDuel::~GameStateDuel() {
@@ -75,8 +77,7 @@ void GameStateDuel::Start()
opponentMenuFont = mFont;
unlocked = -1;
unlockedTex = NULL;
unlockedQuad = NULL;
menu = NEW SimpleMenu(DUEL_MENU_GAME_MENU, this, mFont, SCREEN_WIDTH/2-100, 25);
menu->Add(12,"Back to main menu");
@@ -365,7 +366,6 @@ void GameStateDuel::Render()
JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(200,0,0,0));
char buffer[50];
int unlocked = 0;
int p0life = mPlayers[0]->life;
if (!mPlayers[0]->isAI() && mPlayers[1]->isAI() ){
if (game->gameOver != mPlayers[0]){