Fixed a bug on sound tracks for PSP/PSVita devices, removed a test on vampired trigger due to a fake error on test suite.

CHANGELOG.md

@@ -3,7 +3,9 @@
 ## [master] (https://github.com/WagicProject/wagic/tree/master)
 
 ### 19/09/21
-- *Committed:* Fixed typos in several primitives, updated the "missing_cards_by_sets" folder, fixed MID, MIC and CC2 sets. ([Vitty85](https://github.com/Vitty85))
+- *Committed:* Fixed a bug on sound tracks for PSP/PSVita devices, removed a test on vampired trigger due to a fake error on test suite. ([Vitty85](https://github.com/Vitty85))
+
+- *Committed:* Fixed typos in several primitives, updated the "missing_cards_by_sets" folder, fixed MID, MIC and CC2 sets. https://github.com/WagicProject/wagic/commit/ff47c0dd44fba6f2ccbf9e259583ac7f977741b2 ([Vitty85](https://github.com/Vitty85))
 
 - *Committed:* Added/fixed primitives, updated the "missing_cards_by_sets" folder, added MID, MIC and CC2 sets, improved Android downloader for new added sets. https://github.com/WagicProject/wagic/commit/c2482a50f53eafcef18932b42f7cc00f3809a14f ([Vitty85](https://github.com/Vitty85))
 

projects/mtg/bin/Res/test/_tests.txt

@@ -709,7 +709,7 @@ unwilling_recruit.txt
 urzas_lands.txt
 urzas_lands2.txt
 urzas_mine_i287.txt
-[at]Vampired#1.txt
+#[at]Vampired#1.txt
 vampire_bats.txt
 vampiric_link.txt
 vanishing.txt

projects/mtg/src/GameApp.cpp

@@ -550,8 +550,10 @@ void GameApp::playMusic(string filename, bool loop)
     if (filename.compare(currentMusicFile) == 0 && music)
         return;
 
+#if !defined (PSP)
     if(!WResourceManager::Instance()->ssLoadMusic(filename.c_str()))
-       return; // Added to avoid opening not existing file.
+        return; // Added to avoid opening not existing file.
+#endif
 
     if (music)
     {

projects/mtg/src/GameStateAwards.cpp

@@ -148,7 +148,9 @@ void GameStateAwards::Start()
     setSrc = NULL;
     showMenu = false;
 
+#if !defined (PSP)
     GameApp::playMusic("Track4.mp3"); // Added music for trophies.
+#endif
 }
 
 void GameStateAwards::Create()

projects/mtg/src/GameStateDuel.cpp

@@ -794,6 +794,9 @@ void GameStateDuel::Update(float dt)
             if (!MusicExist(musictrack)) 
                 musictrack = "ai_baka_music.mp3";
 
+#if defined (PSP)
+                musictrack = "ai_baka_music.mp3";
+#endif
             GameApp::playMusic(musictrack);
             // init Score table
             if ( (mParent->gameType == GAME_TYPE_COMMANDER || mParent->gameType == GAME_TYPE_CLASSIC || mParent->gameType == GAME_TYPE_DEMO) && mParent->players[1] == PLAYER_TYPE_CPU)

projects/mtg/src/GameStateMenu.cpp

@@ -141,6 +141,9 @@ void GameStateMenu::Start()
     subMenuController = NULL;
     SAFE_DELETE(mGuiController);
 
+#if defined (PSP)
+    GameApp::playMusic("Track0.mp3");
+#else
     char temp[4096];
     string musicFilename = "";
     sprintf(temp, "MainMenu/TrackMenu%i.mp3", std::rand() % 20); // Now it's possibile to use up to 20 sound tracks for main menu.
@@ -149,7 +152,8 @@ void GameStateMenu::Start()
     if (musicFilename.length() < 1 || !FileExists(musicFilename))
         musicFilename = "Track0.mp3";
     GameApp::playMusic(musicFilename);
-    
+#endif
+
     hasChosenGameType = false;
     mParent->gameType = GAME_TYPE_CLASSIC;
 

projects/mtg/src/GameStateOptions.cpp

@@ -143,7 +143,9 @@ void GameStateOptions::Start()
 
     optionsTabs->Entering(JGE_BTN_NONE);
 
+#if !defined (PSP)
     GameApp::playMusic("Track3.mp3"); // Added music for options.
+#endif
 }
 
 void GameStateOptions::End()

projects/mtg/src/GameStateShop.cpp

@@ -147,7 +147,9 @@ void GameStateShop::Start()
         pspIcons[i]->SetHotSpot(16, 16);
     }
 
+#if !defined (PSP)
     GameApp::playMusic("Track2.mp3"); // Added music for shop.
+#endif
 
     JRenderer::GetInstance()->EnableVSync(true);