- Disabled the new music externalization code from revision 6296 (by Jazz)

o The new music code is now surrounded by a define called NEWMUSIC
o Jazz will rework the new music code in the future
o For now we have the old music code back, which should fix the mentioned bugs
-> Music in the main menu is starting again from beginning when going from preferences screen back to main menu screen
-> The battle tracks can play only 5-15 second then they start from all over again
-> The win music after tactical battle never run
-> ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6381 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/Music Control.h

@@ -42,6 +42,7 @@ enum MusicMode
 	MUSIC_TACTICAL_CIV_GROUP_BATTLE,
 };
 
+#ifdef NEWMUSIC
 typedef struct
 {
 	UINT16 uiIndex;
@@ -58,6 +59,7 @@ typedef struct
 
 extern MUSIC_SOUND_VALUES MusicSoundValues[256];
 extern INT32 GlobalSoundID;
+#endif
 
 //extern UINT32 uiMusicHandle;
 //extern BOOLEAN fMusicPlaying;
@@ -68,10 +70,15 @@ UINT8 GetMusicMode(void);
 BOOLEAN SetMusicMode(UINT8 ubMusicMode);
 
 // only for editor (editscreen.cpp)
+#ifdef NEWMUSIC
 BOOLEAN MusicPlay(UINT32 uiNum, UINT32 MusicMode, BOOLEAN NewSound);
+#else
+BOOLEAN MusicPlay(UINT32 uiNum);
+#endif
 
+#ifdef NEWMUSIC
 BOOLEAN SetMusicModeID(UINT8 ubMusicMode, INT32 SoundID);
-
+#endif
 UINT32 MusicGetVolume(void);
 BOOLEAN MusicSetVolume(UINT32 uiVolume);