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

J :

Browse Source 
* Fix the names of the music files
This commit is contained in:
jean.chalard
2008-11-16 10:23:29 +00:00
parent 138298833b
commit 0b5c940ae3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/mtg/include/GameStateDeckViewer.h
View File

@@ -194,7 +194,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
welcome_menu->Add(10, "Cancel"); welcome_menu->Add(10, "Cancel");
if (GameApp::HasMusic && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){ if (GameApp::HasMusic && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){
if (!bgMusic) bgMusic = JSoundSystem::GetInstance()->LoadMusic("sound/track1.mp3"); if (!bgMusic) bgMusic = JSoundSystem::GetInstance()->LoadMusic("sound/Track1.mp3");
if (bgMusic){ if (bgMusic){
JSoundSystem::GetInstance()->PlayMusic(bgMusic, true); JSoundSystem::GetInstance()->PlayMusic(bgMusic, true);
} }
@@ -265,13 +265,13 @@ class GameStateDeckViewer: public GameState, public JGuiListener
return; return;
} }
if (mStage == STAGE_WAITING || mStage == STAGE_ONSCREEN_MENU){ if (mStage == STAGE_WAITING || mStage == STAGE_ONSCREEN_MENU){
if (mEngine->GetButtonClick(PSP_CTRL_LEFT)){ if (mEngine->GetButtonState(PSP_CTRL_LEFT)){
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getNext(currentCard,colorFilter); currentCard = displayed_deck->getNext(currentCard,colorFilter);
mStage = STAGE_TRANSITION_LEFT; mStage = STAGE_TRANSITION_LEFT;
} }
else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT)) else if (mEngine->GetButtonState(PSP_CTRL_RIGHT))
{ {
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getPrevious(currentCard,colorFilter); currentCard = displayed_deck->getPrevious(currentCard,colorFilter);

2
projects/mtg/include/GameStateMenu.h
View File

@@ -140,7 +140,7 @@ class GameStateMenu: public GameState, public JGuiListener
JRenderer::GetInstance()->EnableVSync(true); JRenderer::GetInstance()->EnableVSync(true);
if (GameApp::HasMusic && !bgMusic && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){ if (GameApp::HasMusic && !bgMusic && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){
bgMusic = JSoundSystem::GetInstance()->LoadMusic("sound/track0.mp3"); bgMusic = JSoundSystem::GetInstance()->LoadMusic("sound/Track0.mp3");
} }
if (bgMusic){ if (bgMusic){