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

Erwan

Browse Source 
- added Salmelo to credits
- updated version number
- fixed some bugs with the Story mode on the PSP
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-05-18 13:50:33 +00:00
parent f85a78198c
commit 2eb5043972
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameApp.cpp
+3
View File
@@ -344,6 +344,9 @@ void GameApp::Render()
return; return;
} }
JRenderer * renderer = JRenderer::GetInstance();
renderer->ClearScreen(ARGB(0,0,0,0));
if (mCurrentState) if (mCurrentState)
mCurrentState->Render(); mCurrentState->Render();
projects/mtg/src/GameStateMenu.cpp
+14 -6
View File
@@ -10,7 +10,7 @@
#include "../include/PlayerData.h" #include "../include/PlayerData.h"
#include "../include/utils.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 DEFAULT_ANGLE_MULTIPLIER 0.4f
#define MAX_ANGLE_MULTIPLIER (3*M_PI) #define MAX_ANGLE_MULTIPLIER (3*M_PI)
@@ -145,11 +145,13 @@ void GameStateMenu::Start(){
SAFE_DELETE(GameApp::music); SAFE_DELETE(GameApp::music);
} }
hasChosenGameType = 1; hasChosenGameType = 0;
mParent->gameType = GAME_TYPE_CLASSIC; mParent->gameType = GAME_TYPE_CLASSIC;
/*
if (options[Options::MOMIR_MODE_UNLOCKED].number) hasChosenGameType = 0; if (options[Options::MOMIR_MODE_UNLOCKED].number) hasChosenGameType = 0;
if (options[Options::RANDOMDECK_MODE_UNLOCKED].number) hasChosenGameType = 0; if (options[Options::RANDOMDECK_MODE_UNLOCKED].number) hasChosenGameType = 0;
*/
bgTexture = resources.RetrieveTexture("menutitle.png", RETRIEVE_LOCK); bgTexture = resources.RetrieveTexture("menutitle.png", RETRIEVE_LOCK);
mBg = resources.RetrieveQuad("menutitle.png", 0, 0, 256, 166); // Create background quad for rendering. 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); 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() void GameStateMenu::Render()
{ {
if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN) return; JRenderer * renderer = JRenderer::GetInstance(); if((currentState & MENU_STATE_MINOR) == MENU_STATE_MINOR_FADEIN)
renderer->ClearScreen(ARGB(0,0,0,0)); return;
JRenderer * renderer = JRenderer::GetInstance();
JLBFont * mFont = resources.GetJLBFont(Constants::MENU_FONT); JLBFont * mFont = resources.GetJLBFont(Constants::MENU_FONT);
if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LANG){ if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LANG){
}else if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LOADING_CARDS){ }else if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LOADING_CARDS){
projects/mtg/src/GameStateOptions.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ void GameStateOptions::Render()
"Check themeinfo.txt for the full credits of each theme!", "Check themeinfo.txt for the full credits of each theme!",
"", "",
"Dev Team: Abrasax, Daddy32, Dr.Solomat, J, Jeck", "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", "Music by Celestial Aeon Project, http://www.jamendo.com",
"", "",