diff options
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/sound.h | 6 | ||||
| -rw-r--r-- | engines/sword1/staticres.cpp | 18 |
2 files changed, 2 insertions, 22 deletions
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index fafc9c2d06..da793bc45a 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -118,12 +118,8 @@ private: char _filePath[100]; static const char _musicList[270]; static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM]; -#ifdef PALMOS_68K -public: - static const FxDef *_fxList; -#else static const FxDef _fxList[312]; -#endif + }; } // End of namespace Sword1 diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp index 08e6a108c4..63a1ce35ef 100644 --- a/engines/sword1/staticres.cpp +++ b/engines/sword1/staticres.cpp @@ -2894,9 +2894,6 @@ 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 PALMOS_68K -const FxDef *Sound::_fxList; -#else const FxDef Sound::_fxList[312] = { // 0 { @@ -6445,7 +6442,7 @@ const FxDef Sound::_fxList[312] = { }, //------------------------ }; -#endif + //-------------------------------------------------------------------------------------- // Continuous & random background sound effects for each location @@ -7156,16 +7153,3 @@ const uint8 *Logic::_helperData[] = { }; } // End of namespace Sword1 - -#ifdef PALMOS_68K -#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 |