Erwan

- fixed the lib to play WAV file (erased too much things in a previous update)
- Updated wav sfx to be playable on the PSP (need to update the lib to accept more formats ?)
- There is still a bug with sfx on the PSP, I suspect I'm erasing files while they are being played !

JGE/src/JAudio.cpp

@@ -388,11 +388,15 @@ void audioInit()  //
 		p_currentWav[i] = NULL;
 	}
   JMP3::init();
+  pspAudioInit();
+	pspAudioSetChannelCallback(0, audioOutCallback_0, NULL);
+	pspAudioSetChannelCallback(1, audioOutCallback_1, NULL);
+	pspAudioSetChannelCallback(2, audioOutCallback_2, NULL);
 }
 
 void audioDestroy()
 {
-	
+	pspAudioEnd();
 }
 
 

projects/mtg/Makefile.3xx

@@ -1,5 +1,5 @@
 TARGET = template
-OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 
+OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DeckStats.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 
 
 
 

projects/mtg/bin/Res/settings/options.txt

@@ -1,50 +1,50 @@
-0
-100
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+0
+100
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0

projects/mtg/include/SimpleMenuItem.h

@@ -4,6 +4,9 @@
 #include <string>
 #include <JLBFont.h>
 #include <JGui.h>
+#include <string>
+
+using std::string;
 
 #define SCALE_SELECTED		1.2f
 #define SCALE_NORMAL		1.0f

projects/mtg/src/GameStateDuel.cpp

@@ -19,6 +19,7 @@ GameStateDuel::GameStateDuel(GameApp* parent): GameState(parent) {
   game = NULL;
   deckmenu = NULL;
   opponentMenu = NULL;
+  opponentMenuFont = NULL;
   menu = NULL;
 #ifdef TESTSUITE
   testSuite = NULL;