[Scummvm-cvs-logs] CVS: scummvm/sword1 sound.h,1.15,1.16 staticres.cpp,1.7,1.8

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17053

Modified Files:
	sound.h staticres.cpp 
Log Message:
Prepare PalmOS support

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sound.h	12 Oct 2004 15:50:00 -0000	1.15
+++ sound.h	21 Oct 2004 12:35:39 -0000	1.16
@@ -22,7 +22,7 @@
 #ifndef BSSOUND_H
 #define BSSOUND_H
 
-#include "object.h"
+#include "sword1/object.h"
 #include "sworddefs.h"
 #include "common/file.h"
 #include "sound/mixer.h"
@@ -111,7 +111,12 @@
 	char _filePath[100];
 	static const char _musicList[270];
 	static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM];
+#ifdef __PALM_OS__
+public:
+	static const FxDef *_fxList;
+#else
 	static const FxDef _fxList[312];
+#endif
 };
 
 } // End of namespace Sword1 

Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/staticres.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- staticres.cpp	11 Jan 2004 15:47:41 -0000	1.7
+++ staticres.cpp	21 Oct 2004 12:35:39 -0000	1.8
@@ -20,15 +20,15 @@
  */
 
 #include "stdafx.h"
-#include "sworddefs.h"
-#include "swordres.h"
-#include "screen.h"
-#include "resman.h"
-#include "objectman.h"
-#include "menu.h"
-#include "music.h"
-#include "sound.h"
-#include "sword1.h"
+#include "sword1/sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/screen.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/menu.h"
+#include "sword1/music.h"
+#include "sword1/sound.h"
+#include "sword1/sword1.h"
 
 namespace Sword1 {
 
@@ -2889,6 +2889,9 @@
 	"rm3d",		// DONE 269 ONe the scene change after the Grand Master says, "George, we have watched you..." This one might need a bit of fiddling to get it to match to the fisticuffs.
 };
 
+#ifdef __PALM_OS__
+const FxDef *Sound::_fxList;
+#else
 const FxDef Sound::_fxList[312] = {
 		// 0
 	{
@@ -6437,6 +6440,7 @@
 	}, 
 	//------------------------
 };
+#endif
 //--------------------------------------------------------------------------------------
 // Continuous & random background sound effects for each location
 
@@ -6565,3 +6569,16 @@
 };
 
 } // End of namespace Sword1
+
+#ifdef __PALM_OS__
+#include "scumm_globals.h"
+
+_GINIT(Sword1_fxList)
+_GSETPTR(Sword1::Sound::_fxList, GBVARS_FXLIST_INDEX, Sword1::FxDef, GBVARS_SWORD1)
+_GEND
+
+_GRELEASE(Sword1_fxList)
+_GRELEASEPTR(GBVARS_FXLIST_INDEX, GBVARS_SWORD1)
+_GEND
+
+#endif