aboutsummaryrefslogtreecommitdiff
path: root/sword1/staticres.cpp
diff options
context:
space:
mode:
authorChris Apers2004-10-21 12:35:39 +0000
committerChris Apers2004-10-21 12:35:39 +0000
commite97d6a5f977ccbac0936fa6b73a7929d0c99cbf2 (patch)
tree49d69ef4354573dcecc87238a606f39fecaf2bd1 /sword1/staticres.cpp
parent2653a45fd352a5c4842eecdc954c3879f0f0044b (diff)
downloadscummvm-rg350-e97d6a5f977ccbac0936fa6b73a7929d0c99cbf2.tar.gz
scummvm-rg350-e97d6a5f977ccbac0936fa6b73a7929d0c99cbf2.tar.bz2
scummvm-rg350-e97d6a5f977ccbac0936fa6b73a7929d0c99cbf2.zip
Prepare PalmOS support
svn-id: r15630
Diffstat (limited to 'sword1/staticres.cpp')
-rw-r--r--sword1/staticres.cpp35
1 files changed, 26 insertions, 9 deletions
diff --git a/sword1/staticres.cpp b/sword1/staticres.cpp
index f8b039cbb8..2294ece0fa 100644
--- a/sword1/staticres.cpp
+++ b/sword1/staticres.cpp
@@ -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 @@ const char Music::_tuneList[TOTAL_TUNES][8] = {
"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 @@ const FxDef Sound::_fxList[312] = {
},
//------------------------
};
+#endif
//--------------------------------------------------------------------------------------
// Continuous & random background sound effects for each location
@@ -6565,3 +6569,16 @@ const uint16 Sound::_roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM] =
};
} // 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