Merge branch 'sound' into test

gframe/game.h

@@ -612,47 +612,5 @@ extern Game* mainGame;
 #define BUTTON_MARKS_FILTER			380
 #define BUTTON_MARKERS_OK			381
 
-#define SOUND_SUMMON				101
-#define SOUND_SPECIAL_SUMMON		102
-#define SOUND_ACTIVATE				103
-#define SOUND_SET					104
-#define SOUND_FILP					105
-#define SOUND_REVEAL				106
-#define SOUND_EQUIP					107
-#define SOUND_DESTROYED				108
-#define SOUND_BANISHED				109
-#define SOUND_TOKEN					110
-
-#define SOUND_ATTACK				201
-#define SOUND_DIRECT_ATTACK			202
-#define SOUND_DRAW					203
-#define SOUND_SHUFFLE				204
-#define SOUND_DAMAGE				205
-#define SOUND_RECOVER				206
-#define SOUND_COUNTER_ADD			207
-#define SOUND_COUNTER_REMOVE		208
-#define SOUND_COIN					209
-#define SOUND_DICE					210
-#define SOUND_NEXT_TURN				211
-#define SOUND_PHASE					212
-
-#define SOUND_MENU					301
-#define SOUND_BUTTON				302
-#define SOUND_INFO					303
-#define SOUND_QUESTION				304
-#define SOUND_CARD_PICK				305
-#define SOUND_CARD_DROP				306
-#define SOUND_PLAYER_ENTER			307
-#define SOUND_CHAT					308
-
-#define BGM_ALL						0
-#define BGM_DUEL					1
-#define BGM_MENU					2
-#define BGM_DECK					3
-#define BGM_ADVANTAGE				4
-#define BGM_DISADVANTAGE			5
-#define BGM_WIN						6
-#define BGM_LOSE					7
-
 #define DEFAULT_DUEL_RULE			4
 #endif // GAME_H

gframe/sound_manager.cpp

@@ -2,6 +2,11 @@
 #ifndef _WIN32
 #include <dirent.h>
 #endif
+#ifdef IRRKLANG_STATIC
+#include "../ikpmp3/ikpMP3.h"
+#endif
+
+#define wcsicmp _wcsicmp
 
 namespace ygo {
 

gframe/sound_manager.h

 #ifndef SOUNDMANAGER_H
 #define SOUNDMANAGER_H
 
-#include "config.h"
 #include "game.h"
 #ifdef YGOPRO_USE_IRRKLANG
 #include <irrKlang.h>
-#ifdef IRRKLANG_STATIC
-#include "../ikpmp3/ikpMP3.h"
 #endif
-#endif
-
-#define wcsicmp _wcsicmp
 
 namespace ygo {
 
@@ -39,6 +33,48 @@ public:
 
 extern SoundManager soundManager;
 
+#define SOUND_SUMMON				101
+#define SOUND_SPECIAL_SUMMON		102
+#define SOUND_ACTIVATE				103
+#define SOUND_SET					104
+#define SOUND_FILP					105
+#define SOUND_REVEAL				106
+#define SOUND_EQUIP					107
+#define SOUND_DESTROYED				108
+#define SOUND_BANISHED				109
+#define SOUND_TOKEN					110
+
+#define SOUND_ATTACK				201
+#define SOUND_DIRECT_ATTACK			202
+#define SOUND_DRAW					203
+#define SOUND_SHUFFLE				204
+#define SOUND_DAMAGE				205
+#define SOUND_RECOVER				206
+#define SOUND_COUNTER_ADD			207
+#define SOUND_COUNTER_REMOVE		208
+#define SOUND_COIN					209
+#define SOUND_DICE					210
+#define SOUND_NEXT_TURN				211
+#define SOUND_PHASE					212
+
+#define SOUND_MENU					301
+#define SOUND_BUTTON				302
+#define SOUND_INFO					303
+#define SOUND_QUESTION				304
+#define SOUND_CARD_PICK				305
+#define SOUND_CARD_DROP				306
+#define SOUND_PLAYER_ENTER			307
+#define SOUND_CHAT					308
+
+#define BGM_ALL						0
+#define BGM_DUEL					1
+#define BGM_MENU					2
+#define BGM_DECK					3
+#define BGM_ADVANTAGE				4
+#define BGM_DISADVANTAGE			5
+#define BGM_WIN						6
+#define BGM_LOSE					7
+
 }
 
 #endif //SOUNDMANAGER_H