Erwan

- Fixed MP3 play bug on the psp. MP3 files need to have NO Id3v2 tag, or they won't play. Also, volume control is broken
- added dt to moving W's easter egg movement.
- Added fullscreen for windows version
- other stuff ?

projects/mtg/src/GameApp.cpp

@@ -21,6 +21,7 @@ const char * const GameState::menuTexts[]= {"--NEW--","Deck 1", "Deck 2", "Deck
 JResourceManager* GameApp::CommonRes = NEW JResourceManager();
 hgeParticleSystem* GameApp::Particles[] = {NULL,NULL,NULL,NULL,NULL,NULL};
 int GameApp::HasMusic = 1;
+JMusic * GameApp::music = NULL;
 
 GameState::GameState(GameApp* parent): mParent(parent)
 {
@@ -75,6 +76,7 @@ void GameApp::Create()
   }
 
 
+
   CommonRes->CreateTexture("graphics/menuicons.png");
   //Creating thes quad in this specific order allows us to have them in the correct order to call them by integer id
   CommonRes->CreateQuad("c_artifact", "graphics/menuicons.png", 2 + 6*36, 38, 32, 32);

projects/mtg/src/GameStateDuel.cpp

@@ -181,6 +181,11 @@ void GameStateDuel::Update(float dt)
     }
 
   }else if (mGamePhase == DUEL_PLAY){
+    //Stop the music before starting the game
+    if (GameApp::music){
+      JSoundSystem::GetInstance()->StopMusic(GameApp::music);
+      SAFE_DELETE(GameApp::music);
+    }
     if (!game){
       GameObserver::Init(mPlayers, 2);
       game = GameObserver::GetInstance();
@@ -209,11 +214,13 @@ void GameStateDuel::Update(float dt)
 	}else{
 	  mGamePhase = DUEL_END;
 	}
-      }else if (mParent->players[0] == PLAYER_TYPE_CPU && mParent->players[1] == PLAYER_TYPE_CPU){
+      }else
+#endif        
+        if (mParent->players[0] == PLAYER_TYPE_CPU && mParent->players[1] == PLAYER_TYPE_CPU){
 	End();
 	Start();
       }
-#endif
+
       mFont->SetColor(ARGB(255,255,255,255));
     }
     if (mEngine->GetButtonClick(PSP_CTRL_START)){