From 2eb5043972103bc75b31041cae3a9675ac873c09 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Tue, 18 May 2010 13:50:33 +0000 Subject: [PATCH] Erwan - added Salmelo to credits - updated version number - fixed some bugs with the Story mode on the PSP --- projects/mtg/src/GameApp.cpp | 3 +++ projects/mtg/src/GameStateMenu.cpp | 20 ++++++++++++++------ projects/mtg/src/GameStateOptions.cpp | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index 216ce69a1..6d04587ca 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -344,6 +344,9 @@ void GameApp::Render() return; } + JRenderer * renderer = JRenderer::GetInstance(); + renderer->ClearScreen(ARGB(0,0,0,0)); + if (mCurrentState) mCurrentState->Render(); diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 41eee9188..8033d92f0 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -10,7 +10,7 @@ #include "../include/PlayerData.h" #include "../include/utils.h" -static const char* GAME_VERSION = "WTH?! 0.11.1 - by wololo"; +static const char* GAME_VERSION = "WTH?! 0.12.0 - by wololo"; #define DEFAULT_ANGLE_MULTIPLIER 0.4f #define MAX_ANGLE_MULTIPLIER (3*M_PI) @@ -145,11 +145,13 @@ void GameStateMenu::Start(){ SAFE_DELETE(GameApp::music); } - hasChosenGameType = 1; + hasChosenGameType = 0; mParent->gameType = GAME_TYPE_CLASSIC; + + /* if (options[Options::MOMIR_MODE_UNLOCKED].number) hasChosenGameType = 0; if (options[Options::RANDOMDECK_MODE_UNLOCKED].number) hasChosenGameType = 0; - + */ bgTexture = resources.RetrieveTexture("menutitle.png", RETRIEVE_LOCK); mBg = resources.RetrieveQuad("menutitle.png", 0, 0, 256, 166); // Create background quad for rendering. @@ -536,12 +538,18 @@ void GameStateMenu::Update(float dt) } scroller->Update(dt); - if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN){ currentState = currentState ^ MENU_STATE_MINOR_FADEIN; mParent->DoAnimation(TRANSITION_FADE_IN,.15); }} + if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN){ + currentState = currentState ^ MENU_STATE_MINOR_FADEIN; + mParent->DoAnimation(TRANSITION_FADE_IN,.15); + } +} void GameStateMenu::Render() { - if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN) return; JRenderer * renderer = JRenderer::GetInstance(); - renderer->ClearScreen(ARGB(0,0,0,0)); + if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN) + return; + + JRenderer * renderer = JRenderer::GetInstance(); JLBFont * mFont = resources.GetJLBFont(Constants::MENU_FONT); if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LANG){ }else if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LOADING_CARDS){ diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 7172efcb7..3a2123b16 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -177,7 +177,7 @@ void GameStateOptions::Render() "Check themeinfo.txt for the full credits of each theme!", "", "Dev Team: Abrasax, Daddy32, Dr.Solomat, J, Jeck", - "Leungclj, Superhiro, Psyringe, Wololo, Yeshua", + "Leungclj, Salmelo, Superhiro, Psyringe, Wololo, Yeshua", "", "Music by Celestial Aeon Project, http://www.jamendo.com", "",