[Scummvm-cvs-logs] SF.net SVN: scummvm: [28803] scummvm/trunk
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sat Sep 1 21:13:06 CEST 2007
Revision: 28803
http://scummvm.svn.sourceforge.net/scummvm/?rev=28803&view=rev
Author: chrilith
Date: 2007-09-01 12:13:04 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
Modified Paths:
--------------
scummvm/trunk/base/main.cpp
scummvm/trunk/common/scummsys.h
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/charset.cpp
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/intern.h
scummvm/trunk/engines/queen/display.cpp
scummvm/trunk/engines/queen/display.h
scummvm/trunk/engines/queen/graphics.cpp
scummvm/trunk/engines/queen/graphics.h
scummvm/trunk/engines/queen/musicdata.cpp
scummvm/trunk/engines/queen/resource.cpp
scummvm/trunk/engines/queen/resource.h
scummvm/trunk/engines/queen/restables.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/queen/sound.h
scummvm/trunk/engines/queen/talk.cpp
scummvm/trunk/engines/queen/talk.h
scummvm/trunk/engines/scumm/akos.cpp
scummvm/trunk/engines/scumm/base-costume.h
scummvm/trunk/engines/scumm/charset.cpp
scummvm/trunk/engines/scumm/costume.cpp
scummvm/trunk/engines/scumm/detection.cpp
scummvm/trunk/engines/scumm/detection_tables.h
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/file_nes.cpp
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
scummvm/trunk/engines/scumm/imuse_digi/dimuse_codecs.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_tables.cpp
scummvm/trunk/engines/scumm/player_v2.cpp
scummvm/trunk/engines/scumm/player_v2a.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/smush/codec47.cpp
scummvm/trunk/engines/scumm/thumbnail.cpp
scummvm/trunk/engines/sky/hufftext.cpp
scummvm/trunk/engines/sky/text.h
scummvm/trunk/engines/sword1/sound.h
scummvm/trunk/engines/sword1/staticres.cpp
scummvm/trunk/graphics/fonts/scummfont.cpp
scummvm/trunk/sound/fmopl.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/base/main.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -52,11 +52,7 @@
#include "gui/launcher.h"
#endif
-#ifdef PALMOS_68K
-#include "args.h"
-#endif
-
static bool launcherDialog(OSystem &system) {
system.beginGFXTransaction();
@@ -249,9 +245,6 @@
// Parse the command line
Common::StringMap settings;
command = Base::parseCommandLine(settings, argc, argv);
-#ifdef PALMOS_68K
- ArgsFree(argv);
-#endif
// Load the config file (possibly overriden via command line):
if (settings.contains("config")) {
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/common/scummsys.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -200,22 +200,12 @@
#elif defined(__PALMOS_TRAPS__) || defined (__PALMOS_ARMLET__)
- #ifdef PALMOS_68K
- # include "globals.h"
- # define SCUMM_BIG_ENDIAN
+ #include <extras_string.h>
+ #define SCUMM_LITTLE_ENDIAN
- # define scumm_stricmp StrCaselessCompare
- # define scumm_strnicmp StrNCaselessCompare
+ #define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
- #else
-
- # include <extras_string.h>
- # define SCUMM_LITTLE_ENDIAN
-
- # define scumm_stricmp stricmp
- # define scumm_strnicmp strnicmp
- #endif
-
#define SCUMM_NEED_ALIGNMENT
#define STRINGBUFLEN 256
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/agos/agos.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -37,21 +37,10 @@
#include "sound/mididrv.h"
#include "sound/mods/protracker.h"
-#ifdef PALMOS_68K
-#include "globals.h"
-#endif
-
using Common::File;
namespace AGOS {
-#ifdef PALMOS_68K
-#define PTR(a) a
-static const GameSpecificSettings *simon1_settings;
-static const GameSpecificSettings *simon2_settings;
-static const GameSpecificSettings *feeblefiles_settings;
-#else
-#define PTR(a) &a
static const GameSpecificSettings simon1_settings = {
"EFFECTS", // effects_filename
"SIMON", // speech_filename
@@ -71,9 +60,7 @@
"", // effects_filename
"MUSIC", // speech_filename
};
-#endif
-
AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system)
: AGOSEngine_Feeble(system) {
}
@@ -692,13 +679,9 @@
};
void AGOSEngine_PuzzlePack::setupGame() {
- gss = PTR(puzzlepack_settings);
+ gss = &puzzlepack_settings;
_numVideoOpcodes = 85;
-#ifndef PALMOS_68K
_vgaMemSize = 7500000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon2Games];
-#endif
_itemMemSize = 20000;
_tableMemSize = 200000;
_frameCount = 1;
@@ -713,13 +696,9 @@
}
void AGOSEngine_Feeble::setupGame() {
- gss = PTR(feeblefiles_settings);
+ gss = &feeblefiles_settings;
_numVideoOpcodes = 85;
-#ifndef PALMOS_68K
_vgaMemSize = 7500000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon2Games];
-#endif
_itemMemSize = 20000;
_tableMemSize = 200000;
_frameCount = 1;
@@ -736,14 +715,12 @@
}
void AGOSEngine_Simon2::setupGame() {
- gss = PTR(simon2_settings);
+ gss = &simon2_settings;
_tableIndexBase = 1580 / 4;
_textIndexBase = 1500 / 4;
_numVideoOpcodes = 75;
#if defined(__DS__)
_vgaMemSize = 1300000;
-#elif defined(PALMOS_68K)
- _vgaMemSize = gVars->memory[kMemSimon2Games];
#else
_vgaMemSize = 2000000;
#endif
@@ -772,15 +749,11 @@
}
void AGOSEngine_Simon1::setupGame() {
- gss = PTR(simon1_settings);
+ gss = &simon1_settings;
_tableIndexBase = 1576 / 4;
_textIndexBase = 1460 / 4;
_numVideoOpcodes = 64;
-#ifndef PALMOS_68K
_vgaMemSize = 1000000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon1Games];
-#endif
_itemMemSize = 20000;
_tableMemSize = 50000;
_musicIndexBase = 1316 / 4;
@@ -802,13 +775,9 @@
}
void AGOSEngine_Waxworks::setupGame() {
- gss = PTR(simon1_settings);
+ gss = &simon1_settings;
_numVideoOpcodes = 64;
-#ifndef PALMOS_68K
_vgaMemSize = 1000000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon1Games];
-#endif
_itemMemSize = 80000;
_tableMemSize = 50000;
_frameCount = 4;
@@ -826,13 +795,9 @@
}
void AGOSEngine_Elvira2::setupGame() {
- gss = PTR(simon1_settings);
+ gss = &simon1_settings;
_numVideoOpcodes = 60;
-#ifndef PALMOS_68K
_vgaMemSize = 1000000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon1Games];
-#endif
_itemMemSize = 64000;
_tableMemSize = 100000;
_frameCount = 4;
@@ -849,13 +814,9 @@
}
void AGOSEngine_Elvira1::setupGame() {
- gss = PTR(simon1_settings);
+ gss = &simon1_settings;
_numVideoOpcodes = 57;
-#ifndef PALMOS_68K
_vgaMemSize = 1000000;
-#else
- _vgaMemSize = gVars->memory[kMemSimon1Games];
-#endif
_itemMemSize = 64000;
_tableMemSize = 256000;
_frameCount = 4;
@@ -1094,20 +1055,3 @@
}
} // End of namespace AGOS
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(AGOS_AGOS)
-_GSETPTR(AGOS::simon1_settings, GBVARS_SIMON1SETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS)
-_GSETPTR(AGOS::simon2_settings, GBVARS_SIMON2SETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS)
-_GSETPTR(AGOS::feeblefiles_settings, GBVARS_FEEBLEFILESSETTINGS_INDEX, AGOS::GameSpecificSettings, GBVARS_AGOS)
-_GEND
-
-_GRELEASE(AGOS_AGOS)
-_GRELEASEPTR(GBVARS_SIMON1SETTINGS_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_SIMON2SETTINGS_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_FEEBLEFILESSETTINGS_INDEX, GBVARS_AGOS)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/agos/charset.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -749,22 +749,6 @@
_lockWord &= ~0x8000;
}
-#ifdef PALMOS_68K
-static const byte *feeble_windowFont;
-static const byte *czech_simonFont;
-static const byte *russian_simonFont;
-static const byte *polish_simonFont;
-static const byte *french_simonFont;
-static const byte *german_simonFont;
-static const byte *hebrew_simonFont;
-static const byte *italian_simonFont;
-static const byte *spanish_simonFont;
-static const byte *english_simonFont;
-static const byte *spanish_commonFont;
-static const byte *italian_commonFont;
-static const byte *french_commonFont;
-static const byte *english_commonFont;
-#else
static const byte feeble_windowFont[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,
128,128,128,128,128,128,128,0,0,128,0,0,0,
@@ -2275,7 +2259,6 @@
0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00,
};
-#endif
void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) {
const byte *src;
@@ -2387,29 +2370,3 @@
} // End of namespace AGOS
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(AGOS_Charset)
-_GSETPTR(AGOS::russian_windowFont, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-//_GSETPTR(AGOS::polish_windowFont, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::french_windowFont, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::german_windowFont, GBVARS_GERMANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::hebrew_windowFont, GBVARS_HEBREWVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::italian_windowFont, GBVARS_ITALIANVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::spanish_windowFont, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GSETPTR(AGOS::english_windowFont, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_AGOS)
-_GEND
-
-_GRELEASE(AGOS_Charset)
-_GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_AGOS)
-//_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_GERMANVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_HEBREWVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_ITALIANVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_SPANISHVIDEOFONT_INDEX, GBVARS_AGOS)
-_GRELEASEPTR(GBVARS_VIDEOFONT_INDEX, GBVARS_AGOS)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/agos/cursor.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -790,16 +790,3 @@
}
} // End of namespace AGOS
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(AGOS_Cursor)
-_GSETPTR(AGOS::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_AGOS)
-_GEND
-
-_GRELEASE(AGOS_Cursor)
-_GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_AGOS)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/agos/intern.h
===================================================================
--- scummvm/trunk/engines/agos/intern.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/agos/intern.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -187,13 +187,8 @@
};
struct GameSpecificSettings {
-#ifndef PALMOS_68K
const char *effects_filename;
const char *speech_filename;
- #else
- const char effects_filename[12];
- const char speech_filename[12];
- #endif
};
enum BoxFlags {
Modified: scummvm/trunk/engines/queen/display.cpp
===================================================================
--- scummvm/trunk/engines/queen/display.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/display.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -36,14 +36,6 @@
namespace Queen {
-#ifdef PALMOS_68K
-static const uint8 *_fontRegular;
-static const uint8 *_fontHebrew;
-static const uint8 *_fontRussian;
-static const uint8 *_palJoeClothes;
-static const uint8 *_palJoeDress;
-#endif
-
Display::Display(QueenEngine *vm, OSystem *system)
: _fullscreen(true), _horizontalScroll(0), _bdWidth(0), _bdHeight(0),
_system(system), _vm(vm) {
@@ -1230,7 +1222,6 @@
}
}
-#ifndef PALMOS_68K
const uint8 Display::_fontRegular[] = {
0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00, 0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00,
0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00, 0xF8, 0xB0, 0xB0, 0x80, 0xB0, 0xB0, 0xC0, 0x00,
@@ -1636,25 +1627,4 @@
0x22, 0xED, 0x42, 0x42, 0x80, 0x45, 0x45, 0xA3, 0x5F, 0x5F, 0xC8, 0x7C, 0x7C, 0xEC, 0x9C, 0x9C
};
-#endif
-
} // End of namespace Queen
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Queen_Display)
-_GSETPTR(Queen::_fontRegular, GBVARS_DISPLAYFONTREGULAR_INDEX, uint8, GBVARS_QUEEN)
-_GSETPTR(Queen::_fontHebrew, GBVARS_DISPLAYFONTHEBREW_INDEX, uint8, GBVARS_QUEEN)
-_GSETPTR(Queen::_palJoeClothes, GBVARS_DISPLAYPALJOECLOTHES_INDEX, uint8, GBVARS_QUEEN)
-_GSETPTR(Queen::_palJoeDress, GBVARS_DISPLAYPALJOEDRESS_INDEX, uint8, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Queen_Display)
-_GRELEASEPTR(GBVARS_DISPLAYFONTREGULAR_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_DISPLAYFONTHEBREW_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_DISPLAYPALJOECLOTHES_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_DISPLAYPALJOEDRESS_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/queen/display.h
===================================================================
--- scummvm/trunk/engines/queen/display.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/display.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -254,13 +254,12 @@
QueenEngine *_vm;
const uint8 *_font;
-#ifndef PALMOS_68K
+
static const uint8 _fontRegular[];
static const uint8 _fontHebrew[];
static const uint8 _fontRussian[];
static const uint8 _palJoeClothes[];
static const uint8 _palJoeDress[];
-#endif
};
Modified: scummvm/trunk/engines/queen/graphics.cpp
===================================================================
--- scummvm/trunk/engines/queen/graphics.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/graphics.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -36,13 +36,6 @@
namespace Queen {
-#ifdef PALMOS_68K
-static const BamScene::BamDataBlock *_carData;
-static const BamScene::BamDataBlock *_fight1Data;
-static const BamScene::BamDataBlock *_fight2Data;
-static const BamScene::BamDataBlock *_fight3Data;
-#endif
-
const Box BobSlot::_defaultBox(-1, -1, -1, -1);
void BobSlot::curPos(int16 xx, int16 yy) {
@@ -1311,7 +1304,6 @@
_flag = READ_BE_UINT16(ptr); ptr += 2;
}
-#ifndef PALMOS_68K
const BamScene::BamDataBlock BamScene::_carData[] = {
{ { 310, 105, 1 }, { 314, 106, 17 }, { 366, 101, 1 }, 0 },
{ { 303, 105, 1 }, { 307, 106, 17 }, { 214, 0, 10 }, 0 },
@@ -1630,25 +1622,5 @@
{ { 75, 96, 1 }, { 187, 96, -23 }, { 0, 0, 0 }, 0 },
{ { 75, 96, 1 }, { 187, 96, -23 }, { 0, 0, 0 }, 99 }
};
-#endif
} // End of namespace Queen
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Queen_Graphics)
-_GSETPTR(Queen::_carData, GBVARS_GRAPHICSCARDATA_INDEX, Queen::BamScene::BamDataBlock, GBVARS_QUEEN)
-_GSETPTR(Queen::_fight1Data, GBVARS_GRAPHICSFIGHT1DATA_INDEX, Queen::BamScene::BamDataBlock, GBVARS_QUEEN)
-_GSETPTR(Queen::_fight2Data, GBVARS_GRAPHICSFIGHT2DATA_INDEX, Queen::BamScene::BamDataBlock, GBVARS_QUEEN)
-_GSETPTR(Queen::_fight3Data, GBVARS_GRAPHICSFIGHT3DATA_INDEX, Queen::BamScene::BamDataBlock, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Queen_Graphics)
-_GRELEASEPTR(GBVARS_GRAPHICSCARDATA_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_GRAPHICSFIGHT1DATA_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_GRAPHICSFIGHT2DATA_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_GRAPHICSFIGHT3DATA_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/queen/graphics.h
===================================================================
--- scummvm/trunk/engines/queen/graphics.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/graphics.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -261,18 +261,12 @@
int16 frame;
};
-#ifdef PALMOS_68K
-public:
-#endif
struct BamDataBlock {
BamDataObj obj1; // truck / Frank
BamDataObj obj2; // Rico / robot
BamDataObj fx;
int16 sfx;
};
-#ifdef PALMOS_68K
-private:
-#endif
BobSlot *_obj1;
BobSlot *_obj2;
@@ -283,13 +277,11 @@
QueenEngine *_vm;
-#ifndef PALMOS_68K
static const BamDataBlock _carData[];
static const BamDataBlock _fight1Data[];
static const BamDataBlock _fight2Data[];
static const BamDataBlock _fight3Data[];
static const BamDataBlock _fight4Data[];
-#endif
};
} // End of namespace Queen
Modified: scummvm/trunk/engines/queen/musicdata.cpp
===================================================================
--- scummvm/trunk/engines/queen/musicdata.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/musicdata.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -28,16 +28,6 @@
namespace Queen {
-#ifdef PALMOS_68K
-
-const songData *Sound::_songDemo;
-const songData *Sound::_song;
-const tuneData *Sound::_tuneDemo;
-const tuneData *Sound::_tune;
-const char *Sound::_sfxName;
-const int16 *Sound::_jungleList;
-
-#else
const songData Sound::_songDemo[] = {
/* 1 - Hotel Gangsters */
{ { 1, 0 }, 128, 128, 128, 1, 0 },
@@ -1919,29 +1909,6 @@
};
const int16 Sound::_jungleList[] = { 15, 16, 17, 18, 7, 8, 9, 10, 11, 12, 13, 14, 0 };
-#endif
-} // End of namespace Queen
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Queen_Musicdata)
-_GSETPTR(Queen::Sound::_songDemo, GBVARS_MUSICDATASONGDEMO_INDEX, Queen::songData, GBVARS_QUEEN)
-_GSETPTR(Queen::Sound::_song, GBVARS_MUSICDATASONG_INDEX, Queen::songData, GBVARS_QUEEN)
-_GSETPTR(Queen::Sound::_tuneDemo, GBVARS_MUSICDATATUNEDEMO_INDEX, Queen::tuneData, GBVARS_QUEEN)
-_GSETPTR(Queen::Sound::_tune, GBVARS_MUSICDATATUNE_INDEX, Queen::tuneData, GBVARS_QUEEN)
-_GSETPTR(Queen::Sound::_sfxName, GBVARS_MUSICDATASFXNAME_INDEX, char, GBVARS_QUEEN)
-_GSETPTR(Queen::Sound::_jungleList, GBVARS_MUSICDATAJUNGLELIST_INDEX, int16, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Queen_Musicdata)
-_GRELEASEPTR(GBVARS_MUSICDATASONGDEMO_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_MUSICDATASONG_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_MUSICDATATUNEDEMO_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_MUSICDATATUNE_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_MUSICDATASFXNAME_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_MUSICDATAJUNGLELIST_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
+} // End of namespace Queen
Modified: scummvm/trunk/engines/queen/resource.cpp
===================================================================
--- scummvm/trunk/engines/queen/resource.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/resource.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -30,9 +30,6 @@
namespace Queen {
-#ifdef PALMOS_68K
-static ResourceEntry *_resourceTablePEM10;
-#endif
const char *Resource::_tableFilename = "queen.tbl";
@@ -325,16 +322,3 @@
}
} // End of namespace Queen
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Queen_Restables)
-_GSETPTR(Queen::_resourceTablePEM10, GBVARS_RESOURCETABLEPM10_INDEX, Queen::ResourceEntry, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Queen_Restables)
-_GRELEASEPTR(GBVARS_RESOURCETABLEPM10_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/queen/resource.h
===================================================================
--- scummvm/trunk/engines/queen/resource.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/resource.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -165,10 +165,8 @@
//! known FOTAQ versions
static const RetailGameVersion _gameVersions[];
-#ifndef PALMOS_68K
//! resource table for english floppy version
static ResourceEntry _resourceTablePEM10[];
-#endif
};
} // End of namespace Queen
Modified: scummvm/trunk/engines/queen/restables.cpp
===================================================================
--- scummvm/trunk/engines/queen/restables.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/restables.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -27,7 +27,6 @@
namespace Queen {
-#ifndef PALMOS_68K
//English Floppy Version
ResourceEntry Resource::_resourceTablePEM10[] = {
{ "1000SSSS.SB", 1, 0x00000000, 0x000027fe },
@@ -1107,5 +1106,5 @@
{ "ZOMBIE1.DOG", 1, 0x0159ecef, 0x00000f6a },
{ "ZOMBIE2.DOG", 1, 0x0159fc59, 0x00000c40 }
};
-#endif
+
} // End of namespace Queen
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/sound.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -173,13 +173,8 @@
}
void PCSound::playSfx(uint16 sfx) {
- if (sfxOn() && sfx != 0) {
-#ifndef PALMOS_68K
+ if (sfxOn() && sfx != 0)
playSound(_sfxName[sfx - 1], false);
-#else
- playSound(_sfxName + 10 * (sfx - 1), false); // saved as 8char + /0/0
-#endif
- }
}
void PCSound::playSong(int16 songNum) {
Modified: scummvm/trunk/engines/queen/sound.h
===================================================================
--- scummvm/trunk/engines/queen/sound.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/sound.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -103,21 +103,12 @@
void saveState(byte *&ptr);
void loadState(uint32 ver, byte *&ptr);
-#ifndef PALMOS_68K
static const songData _songDemo[];
static const songData _song[];
static const tuneData _tuneDemo[];
static const tuneData _tune[];
static const char *_sfxName[];
static const int16 _jungleList[];
-#else
- static const songData *_songDemo;
- static const songData *_song;
- static const tuneData *_tuneDemo;
- static const tuneData *_tune;
- static const char *_sfxName;
- static const int16 *_jungleList;
-#endif
protected:
Modified: scummvm/trunk/engines/queen/talk.cpp
===================================================================
--- scummvm/trunk/engines/queen/talk.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/talk.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -46,10 +46,6 @@
namespace Queen {
-#ifdef PALMOS_68K
-static const Talk::SpeechParameters *_speechParameters;
-#endif
-
void Talk::talk(
const char *filename,
int personInRoom,
@@ -1357,7 +1353,6 @@
return selectedSentence;
}
-#ifndef PALMOS_68K
const Talk::SpeechParameters Talk::_speechParameters[] = {
{ "JOE", 0, 1, 1, 10, 2, 3, "", 0 },
{ "JOE", 0, 3, 3, 28, 2, 3, "", 0 },
@@ -1818,19 +1813,5 @@
{ "*", 0, 0, 0, 0, 0, 0, "", 0 }
};
-#endif
} // End of namespace Queen
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Queen_Talk)
-_GSETPTR(Queen::_speechParameters, GBVARS_SPEECHPARAMETERS_INDEX, Queen::Talk::SpeechParameters, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Queen_Talk)
-_GRELEASEPTR(GBVARS_SPEECHPARAMETERS_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/queen/talk.h
===================================================================
--- scummvm/trunk/engines/queen/talk.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/queen/talk.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -81,7 +81,6 @@
int16 gameStateValue;
};
-#ifndef PALMOS_68K
struct SpeechParameters {
const char *name;
signed char state,faceDirection;
@@ -89,17 +88,6 @@
const char *animation;
signed char ff;
};
-#else
-public:
- struct SpeechParameters {
- const char name[11];
- signed char state,faceDirection;
- signed char body,bf,rf,af;
- const char animation[80];
- signed char ff;
- };
-private:
-#endif
QueenEngine *_vm;
@@ -154,9 +142,7 @@
char _talkString[5][MAX_STRING_SIZE];
char _joeVoiceFilePrefix[5][MAX_STRING_SIZE];
-#ifndef PALMOS_68K
static const SpeechParameters _speechParameters[];
-#endif
Talk(QueenEngine *vm);
~Talk();
Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/akos.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -617,10 +617,6 @@
} while (1);
}
-#ifdef PALMOS_68K
-const byte *bigCostumeScaleTable;
-const byte *smallCostumeScaleTableAKOS;
-#else
// This is exact duplicate of smallCostumeScaleTable[] in costume.cpp
// See FIXME below for explanation
const byte smallCostumeScaleTableAKOS[256] = {
@@ -757,7 +753,6 @@
0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
};
-#endif
byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
int num_colors;
@@ -1862,18 +1857,3 @@
#endif
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Akos)
-_GSETPTR(Scumm::bigCostumeScaleTable, GBVARS_BIGSCALETABLE_INDEX, byte, GBVARS_SCUMM)
-//_GSETPTR(Scumm::smallCostumeScaleTableAKOS, GBVARS_SMALLSCALETABLEAKOS_INDEX, byte, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Akos)
-_GRELEASEPTR(GBVARS_BIGSCALETABLE_INDEX, GBVARS_SCUMM)
-//_GRELEASEPTR(GBVARS_SMALLSCALETABLEAKOS_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/base-costume.h
===================================================================
--- scummvm/trunk/engines/scumm/base-costume.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/base-costume.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -42,17 +42,10 @@
#include "common/pack-end.h" // END STRUCT PACKING
-
-#ifdef PALMOS_68K
-extern const byte *smallCostumeScaleTable;
-extern const byte *bigCostumeScaleTable;
-#else
extern const byte smallCostumeScaleTable[256];
extern const byte bigCostumeScaleTable[768];
-#endif
-
class Actor;
class ScummEngine;
struct VirtScreen;
Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/charset.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -498,13 +498,6 @@
setCurID(oldID);
}
-#ifdef PALMOS_68K
-static const byte *englishCharsetDataV2;
-static const byte *germanCharsetDataV2;
-static const byte *frenchCharsetDataV2;
-static const byte *italianCharsetDataV2;
-static const byte *spanishCharsetDataV2;
-#else
// English Zak font
static const byte englishCharsetDataV2[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1165,7 +1158,6 @@
0x1c, 0x36, 0x36, 0x7c, 0x66, 0x66, 0x7c, 0x40,
0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
};
-#endif
CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
: CharsetRendererV3(vm) {
@@ -1890,24 +1882,3 @@
}
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Charset)
-_GSETPTR(Scumm::germanCharsetDataV2, GBVARS_GERMANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
-_GSETPTR(Scumm::frenchCharsetDataV2, GBVARS_FRENCHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
-_GSETPTR(Scumm::englishCharsetDataV2, GBVARS_ENGLISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
-_GSETPTR(Scumm::italianCharsetDataV2, GBVARS_ITALIANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
-_GSETPTR(Scumm::spanishCharsetDataV2, GBVARS_SPANISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Charset)
-_GRELEASEPTR(GBVARS_GERMANCHARSETDATAV2_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FRENCHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_ENGLISHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_ITALIANCHARSETDATAV2_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_SPANISHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/costume.cpp
===================================================================
--- scummvm/trunk/engines/scumm/costume.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/costume.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -32,9 +32,6 @@
namespace Scumm {
-#ifdef PALMOS_68K
-const byte *smallCostumeScaleTable;
-#else
const byte smallCostumeScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
@@ -69,7 +66,6 @@
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
};
-#endif
static const int v1MMNESLookup[25] = {
0x00, 0x03, 0x01, 0x06, 0x08,
@@ -1165,16 +1161,3 @@
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Costume)
-_GSETPTR(Scumm::smallCostumeScaleTable, GBVARS_SMALLSCALETABLE_INDEX, byte, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Costume)
-_GRELEASEPTR(GBVARS_SMALLSCALETABLE_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/detection.cpp
===================================================================
--- scummvm/trunk/engines/scumm/detection.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/detection.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -56,11 +56,7 @@
}
static const MD5Table *findInMD5Table(const char *md5) {
-#ifdef PALMOS_68K
- uint32 arraySize = MemPtrSize((void *)md5table) / sizeof(MD5Table) - 1;
-#else
uint32 arraySize = ARRAYSIZE(md5table) - 1;
-#endif
return (const MD5Table *)bsearch(md5, md5table, arraySize, sizeof(MD5Table), compareMD5Table);
}
@@ -886,11 +882,9 @@
*engine = new ScummEngine_v70he(syst, res);
break;
#endif
-#ifndef PALMOS_68K
case 61:
*engine = new ScummEngine_v60he(syst, res);
break;
-#endif
default:
*engine = new ScummEngine_v6(syst, res);
}
@@ -913,16 +907,3 @@
REGISTER_PLUGIN(SCUMM, "Scumm Engine",
"LucasArts SCUMM Games (C) LucasArts\n"
"Humongous SCUMM Games (C) Humongous" );
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Scumm_md5table)
-_GSETPTR(md5table, GBVARS_MD5TABLE_INDEX, MD5Table, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Scumm_md5table)
-_GRELEASEPTR(GBVARS_MD5TABLE_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/detection_tables.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -37,11 +37,7 @@
//#include "scumm/intern.h"
//#include "scumm/he/intern_he.h"
-#ifdef PALMOS_68K
-#include "extras/palm-scumm-md5.h"
-#else
#include "scumm/scumm-md5.h"
-#endif
namespace Scumm {
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -81,11 +81,6 @@
char string[80];
};
-#ifdef PALMOS_68K
-static const ResString *string_map_table_v7;
-static const ResString *string_map_table_v6;
-static const ResString *string_map_table_v5;
-#else
static const ResString string_map_table_v8[] = {
{0, "/BT_100/Please insert disk %d. Press ENTER"},
{0, "/BT__003/Unable to Find %s, (%s %d) Press Button."},
@@ -216,7 +211,6 @@
{20, "Select a game to LOAD"},
{28, "Game title"}
};
-#endif
#pragma mark -
@@ -967,20 +961,3 @@
}
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Dialogs)
-_GSETPTR(Scumm::string_map_table_v7, GBVARS_STRINGMAPTABLEV7_INDEX, Scumm::ResString, GBVARS_SCUMM)
-_GSETPTR(Scumm::string_map_table_v6, GBVARS_STRINGMAPTABLEV6_INDEX, Scumm::ResString, GBVARS_SCUMM)
-_GSETPTR(Scumm::string_map_table_v5, GBVARS_STRINGMAPTABLEV5_INDEX, Scumm::ResString, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Dialogs)
-_GRELEASEPTR(GBVARS_STRINGMAPTABLEV7_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_STRINGMAPTABLEV6_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_STRINGMAPTABLEV5_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/file_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file_nes.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/file_nes.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -71,14 +71,6 @@
_stream->setEnc(enc);
}
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_roomgfx_usa;
-static const ScummNESFile::Resource *res_roomgfx_eur;
-static const ScummNESFile::Resource *res_roomgfx_swe;
-static const ScummNESFile::Resource *res_roomgfx_fra;
-static const ScummNESFile::Resource *res_roomgfx_ger;
-static const ScummNESFile::Resource *res_roomgfx_esp;
-#else
static const ScummNESFile::Resource res_roomgfx_usa[40] = {
{ 0x04001, 0x03C9, NES_ROOMGFX }, { 0x043CA, 0x069E, NES_ROOMGFX }, { 0x04A68, 0x0327, NES_ROOMGFX }, { 0x04D8F, 0x053B, NES_ROOMGFX }, { 0x052CA, 0x06BE, NES_ROOMGFX },
{ 0x05988, 0x0682, NES_ROOMGFX }, { 0x0600A, 0x0778, NES_ROOMGFX }, { 0x06782, 0x0517, NES_ROOMGFX }, { 0x06C99, 0x07FB, NES_ROOMGFX }, { 0x07494, 0x07BE, NES_ROOMGFX },
@@ -139,7 +131,7 @@
{ 0x07CA4, 0x02D6, NES_ROOMGFX }, { 0x10001, 0x06A3, NES_ROOMGFX }, { 0x106A4, 0x091F, NES_ROOMGFX }, { 0x10FC3, 0x0361, NES_ROOMGFX }, { 0x11324, 0x0489, NES_ROOMGFX },
{ 0x117AD, 0x0437, NES_ROOMGFX }, { 0x11BE4, 0x086E, NES_ROOMGFX }, { 0x12452, 0x0199, NES_ROOMGFX }, { 0x125EB, 0x0947, NES_ROOMGFX }, { 0x12F32, 0x037A, NES_ROOMGFX }
};
-#endif
+
static const ScummNESFile::Resource *res_roomgfx[ScummNESFile::kROMsetNum] = {
res_roomgfx_usa,
res_roomgfx_eur,
@@ -149,14 +141,6 @@
res_roomgfx_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_costumegfx_usa;
-static const ScummNESFile::Resource *res_costumegfx_eur;
-static const ScummNESFile::Resource *res_costumegfx_swe;
-static const ScummNESFile::Resource *res_costumegfx_fra;
-static const ScummNESFile::Resource *res_costumegfx_ger;
-static const ScummNESFile::Resource *res_costumegfx_esp;
-#else
static const ScummNESFile::Resource res_costumegfx_usa[2] = { { 0x30001, 0x0EB8, NES_COSTUMEGFX }, { 0x2F9F1, 0x0340, NES_COSTUMEGFX } };
static const ScummNESFile::Resource res_costumegfx_eur[2] = { { 0x30001, 0x0EB8, NES_COSTUMEGFX }, { 0x2F9F1, 0x0340, NES_COSTUMEGFX } };
static const ScummNESFile::Resource res_costumegfx_swe[2] = { { 0x2EFE1, 0x0EB8, NES_COSTUMEGFX }, { 0x30001, 0x0340, NES_COSTUMEGFX } };
@@ -164,7 +148,6 @@
static const ScummNESFile::Resource res_costumegfx_ger[2] = { { 0x30001, 0x0EB8, NES_COSTUMEGFX }, { 0x2F4CE, 0x0340, NES_COSTUMEGFX } };
static const ScummNESFile::Resource res_costumegfx_esp[2] = { { 0x30001, 0x0EB8, NES_COSTUMEGFX }, { 0x2F0F6, 0x0340, NES_COSTUMEGFX } };
-#endif
static const ScummNESFile::Resource *res_costumegfx[ScummNESFile::kROMsetNum] = {
res_costumegfx_usa,
res_costumegfx_eur,
@@ -174,14 +157,6 @@
res_costumegfx_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_rooms_usa;
-static const ScummNESFile::Resource *res_rooms_eur;
-static const ScummNESFile::Resource *res_rooms_swe;
-static const ScummNESFile::Resource *res_rooms_fra;
-static const ScummNESFile::Resource *res_rooms_ger;
-static const ScummNESFile::Resource *res_rooms_esp;
-#else
static const ScummNESFile::Resource res_rooms_usa[55] = {
{ 0x00000, 0x0000, NES_ROOM }, { 0x14001, 0x0D0C, NES_ROOM }, { 0x134A8, 0x04B3, NES_ROOM }, { 0x15397, 0x0849, NES_ROOM }, { 0x15C68, 0x0685, NES_ROOM },
{ 0x16381, 0x0715, NES_ROOM }, { 0x1395B, 0x04E7, NES_ROOM }, { 0x16CE8, 0x0AC0, NES_ROOM }, { 0x18001, 0x06BA, NES_ROOM }, { 0x17AED, 0x03CB, NES_ROOM },
@@ -260,7 +235,7 @@
{ 0x289BE, 0x058E, NES_ROOM }, { 0x2A418, 0x0201, NES_ROOM }, { 0x2A6BE, 0x0325, NES_ROOM }, { 0x23D84, 0x01FC, NES_ROOM }, { 0x2AC46, 0x02A9, NES_ROOM },
{ 0x2AEEF, 0x02C9, NES_ROOM }, { 0x2B2C0, 0x03D2, NES_ROOM }, { 0x27D12, 0x0207, NES_ROOM }, { 0x2B7FC, 0x0168, NES_ROOM }, { 0x2BD06, 0x0169, NES_ROOM }
};
-#endif
+
static const ScummNESFile::Resource *res_rooms[ScummNESFile::kROMsetNum] = {
res_rooms_usa,
res_rooms_eur,
@@ -270,14 +245,6 @@
res_rooms_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_scripts_usa;
-static const ScummNESFile::Resource *res_scripts_eur;
-static const ScummNESFile::Resource *res_scripts_swe;
-static const ScummNESFile::Resource *res_scripts_fra;
-static const ScummNESFile::Resource *res_scripts_ger;
-static const ScummNESFile::Resource *res_scripts_esp;
-#else
static const ScummNESFile::Resource res_scripts_usa[179] = {
{ 0x00000, 0x0000, NES_SCRIPT }, { 0x29966, 0x044D, NES_SCRIPT }, { 0x29DB3, 0x0207, NES_SCRIPT }, { 0x29FBA, 0x009F, NES_SCRIPT }, { 0x2A059, 0x03F4, NES_SCRIPT },
{ 0x2A44D, 0x01A1, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2A5EE, 0x004A, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2A638, 0x0005, NES_SCRIPT },
@@ -506,7 +473,7 @@
{ 0x2A2C7, 0x0005, NES_SCRIPT }, { 0x2A2CC, 0x0005, NES_SCRIPT }, { 0x2A2D1, 0x0005, NES_SCRIPT }, { 0x2A2D6, 0x0005, NES_SCRIPT }, { 0x216E8, 0x0033, NES_SCRIPT },
{ 0x2A2DB, 0x0005, NES_SCRIPT }, { 0x00000, 0x0000, NES_SCRIPT }, { 0x2A2E0, 0x009C, NES_SCRIPT }, { 0x2A37C, 0x009C, NES_SCRIPT }
};
-#endif
+
static const ScummNESFile::Resource *res_scripts[ScummNESFile::kROMsetNum] = {
res_scripts_usa,
res_scripts_eur,
@@ -516,14 +483,6 @@
res_scripts_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sounds_usa;
-static const ScummNESFile::Resource *res_sounds_eur;
-static const ScummNESFile::Resource *res_sounds_swe;
-static const ScummNESFile::Resource *res_sounds_fra;
-static const ScummNESFile::Resource *res_sounds_ger;
-static const ScummNESFile::Resource *res_sounds_esp;
-#else
static const ScummNESFile::Resource res_sounds_usa[82] = {
{ 0x0FFE8, 0x000A, NES_SOUND }, { 0x30ECA, 0x0832, NES_SOUND }, { 0x30ECA, 0x0832, NES_SOUND }, { 0x30ECA, 0x0832, NES_SOUND }, { 0x30ECA, 0x0832, NES_SOUND },
{ 0x30ECA, 0x0832, NES_SOUND }, { 0x17FCA, 0x0011, NES_SOUND }, { 0x27E0B, 0x0073, NES_SOUND }, { 0x17FDB, 0x0011, NES_SOUND }, { 0x17FEC, 0x0011, NES_SOUND },
@@ -638,7 +597,7 @@
{ 0x36320, 0x0E56, NES_SOUND }, { 0x37176, 0x0C70, NES_SOUND }, { 0x38001, 0x0DEC, NES_SOUND }, { 0x38DED, 0x0B77, NES_SOUND }, { 0x33B4F, 0x042F, NES_SOUND },
{ 0x39964, 0x0AC5, NES_SOUND }, { 0x3A429, 0x0BE4, NES_SOUND }
};
-#endif
+
static const ScummNESFile::Resource *res_sounds[ScummNESFile::kROMsetNum] = {
res_sounds_usa,
res_sounds_eur,
@@ -648,14 +607,6 @@
res_sounds_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_costumes_usa;
-static const ScummNESFile::Resource *res_costumes_eur;
-static const ScummNESFile::Resource *res_costumes_swe;
-static const ScummNESFile::Resource *res_costumes_fra;
-static const ScummNESFile::Resource *res_costumes_ger;
-static const ScummNESFile::Resource *res_costumes_esp;
-#else
static const ScummNESFile::Resource res_costumes_usa[25] = {
{ 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME },
{ 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME }, { 0x13FAB, 0x004B, NES_COSTUME }, { 0x17F05, 0x0055, NES_COSTUME },
@@ -698,7 +649,7 @@
{ 0x0FEF1, 0x0055, NES_COSTUME }, { 0x13F28, 0x003B, NES_COSTUME }, { 0x0FEF1, 0x0055, NES_COSTUME }, { 0x17F2A, 0x0045, NES_COSTUME }, { 0x1FE71, 0x0040, NES_COSTUME },
{ 0x1FEB1, 0x003C, NES_COSTUME }, { 0x13EEE, 0x003A, NES_COSTUME }, { 0x13EEE, 0x003A, NES_COSTUME }, { 0x0FEF1, 0x0055, NES_COSTUME }, { 0x13EA3, 0x004B, NES_COSTUME }
};
-#endif
+
static const ScummNESFile::Resource *res_costumes[ScummNESFile::kROMsetNum] = {
res_costumes_usa,
res_costumes_eur,
@@ -708,21 +659,13 @@
res_costumes_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_globdata_usa;
-static const ScummNESFile::Resource *res_globdata_eur;
-static const ScummNESFile::Resource *res_globdata_swe;
-static const ScummNESFile::Resource *res_globdata_fra;
-static const ScummNESFile::Resource *res_globdata_ger;
-static const ScummNESFile::Resource *res_globdata_esp;
-#else
static const ScummNESFile::Resource res_globdata_usa[1] = { { 0x2CA11, 0x0307, NES_GLOBDATA } };
static const ScummNESFile::Resource res_globdata_eur[1] = { { 0x2CA11, 0x0307, NES_GLOBDATA } };
static const ScummNESFile::Resource res_globdata_swe[1] = { { 0x2C001, 0x0307, NES_GLOBDATA } };
static const ScummNESFile::Resource res_globdata_fra[1] = { { 0x2C628, 0x0307, NES_GLOBDATA } };
static const ScummNESFile::Resource res_globdata_ger[1] = { { 0x2C4EE, 0x0307, NES_GLOBDATA } };
static const ScummNESFile::Resource res_globdata_esp[1] = { { 0x2C001, 0x0307, NES_GLOBDATA } };
-#endif
+
static const ScummNESFile::Resource *res_globdata[ScummNESFile::kROMsetNum] = {
res_globdata_usa,
res_globdata_eur,
@@ -732,14 +675,6 @@
res_globdata_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sprpals_usa;
-static const ScummNESFile::Resource *res_sprpals_eur;
-static const ScummNESFile::Resource *res_sprpals_swe;
-static const ScummNESFile::Resource *res_sprpals_fra;
-static const ScummNESFile::Resource *res_sprpals_ger;
-static const ScummNESFile::Resource *res_sprpals_esp;
-#else
// sprite palette data
static const ScummNESFile::Resource res_sprpals_usa[2] = { { 0x0BFC1, 0x0010, NES_SPRPALS }, { 0x0BFD1, 0x0010, NES_SPRPALS } };
static const ScummNESFile::Resource res_sprpals_eur[2] = { { 0x07F61, 0x0010, NES_SPRPALS }, { 0x0BEB2, 0x0010, NES_SPRPALS } };
@@ -747,7 +682,7 @@
static const ScummNESFile::Resource res_sprpals_fra[2] = { { 0x07ED8, 0x0010, NES_SPRPALS }, { 0x07EE8, 0x0010, NES_SPRPALS } };
static const ScummNESFile::Resource res_sprpals_ger[2] = { { 0x07F6B, 0x0010, NES_SPRPALS }, { 0x0BF17, 0x0010, NES_SPRPALS } };
static const ScummNESFile::Resource res_sprpals_esp[2] = { { 0x0BF15, 0x0010, NES_SPRPALS }, { 0x0BF25, 0x0010, NES_SPRPALS } };
-#endif
+
static const ScummNESFile::Resource *res_sprpals[ScummNESFile::kROMsetNum] = {
res_sprpals_usa,
res_sprpals_eur,
@@ -757,14 +692,6 @@
res_sprpals_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sprdesc_usa;
-static const ScummNESFile::Resource *res_sprdesc_eur;
-static const ScummNESFile::Resource *res_sprdesc_swe;
-static const ScummNESFile::Resource *res_sprdesc_fra;
-static const ScummNESFile::Resource *res_sprdesc_ger;
-static const ScummNESFile::Resource *res_sprdesc_esp;
-#else
// associates costume IDs with sprite sets (indexes into SPRLENS/SPROFFS)
static const ScummNESFile::Resource res_sprdesc_usa[2] = { { 0x0FFB7, 0x0031, NES_SPRDESC }, { 0x0BFE1, 0x0009, NES_SPRDESC } };
static const ScummNESFile::Resource res_sprdesc_eur[2] = { { 0x0BEC2, 0x0031, NES_SPRDESC }, { 0x07F71, 0x0009, NES_SPRDESC } };
@@ -772,7 +699,7 @@
static const ScummNESFile::Resource res_sprdesc_fra[2] = { { 0x07EF8, 0x0031, NES_SPRDESC }, { 0x07F29, 0x0009, NES_SPRDESC } };
static const ScummNESFile::Resource res_sprdesc_ger[2] = { { 0x0BF27, 0x0031, NES_SPRDESC }, { 0x0BF58, 0x0009, NES_SPRDESC } };
static const ScummNESFile::Resource res_sprdesc_esp[2] = { { 0x0BF35, 0x0031, NES_SPRDESC }, { 0x0BF66, 0x0009, NES_SPRDESC } };
-#endif
+
static const ScummNESFile::Resource *res_sprdesc[ScummNESFile::kROMsetNum] = {
res_sprdesc_usa,
res_sprdesc_eur,
@@ -782,14 +709,6 @@
res_sprdesc_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sprlens_usa;
-static const ScummNESFile::Resource *res_sprlens_eur;
-static const ScummNESFile::Resource *res_sprlens_swe;
-static const ScummNESFile::Resource *res_sprlens_fra;
-static const ScummNESFile::Resource *res_sprlens_ger;
-static const ScummNESFile::Resource *res_sprlens_esp;
-#else
// number of sprites in each set (indicates length within SPRDATA)
static const ScummNESFile::Resource res_sprlens_usa[2] = { { 0x0FEA2, 0x0115, NES_SPRLENS }, { 0x07FF5, 0x0006, NES_SPRLENS } };
static const ScummNESFile::Resource res_sprlens_eur[2] = { { 0x1BE32, 0x0115, NES_SPRLENS }, { 0x07F5B, 0x0006, NES_SPRLENS } };
@@ -797,7 +716,7 @@
static const ScummNESFile::Resource res_sprlens_fra[2] = { { 0x0FE61, 0x0115, NES_SPRLENS }, { 0x07ED2, 0x0006, NES_SPRLENS } };
static const ScummNESFile::Resource res_sprlens_ger[2] = { { 0x2BE1A, 0x0115, NES_SPRLENS }, { 0x07F65, 0x0006, NES_SPRLENS } };
static const ScummNESFile::Resource res_sprlens_esp[2] = { { 0x2EFE1, 0x0115, NES_SPRLENS }, { 0x07F7A, 0x0006, NES_SPRLENS } };
-#endif
+
static const ScummNESFile::Resource *res_sprlens[ScummNESFile::kROMsetNum] = {
res_sprlens_usa,
res_sprlens_eur,
@@ -807,14 +726,6 @@
res_sprlens_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sproffs_usa;
-static const ScummNESFile::Resource *res_sproffs_eur;
-static const ScummNESFile::Resource *res_sproffs_swe;
-static const ScummNESFile::Resource *res_sproffs_fra;
-static const ScummNESFile::Resource *res_sproffs_ger;
-static const ScummNESFile::Resource *res_sproffs_esp;
-#else
// offset of each sprite set (indexes into SPRDATA)
static const ScummNESFile::Resource res_sproffs_usa[2] = { { 0x2BDC5, 0x022A, NES_SPROFFS }, { 0x0BFEA, 0x000C, NES_SPROFFS } };
static const ScummNESFile::Resource res_sproffs_eur[2] = { { 0x2FD42, 0x022A, NES_SPROFFS }, { 0x0BEF3, 0x000C, NES_SPROFFS } };
@@ -822,7 +733,7 @@
static const ScummNESFile::Resource res_sproffs_fra[2] = { { 0x2F959, 0x022A, NES_SPROFFS }, { 0x07F32, 0x000C, NES_SPROFFS } };
static const ScummNESFile::Resource res_sproffs_ger[2] = { { 0x2F81F, 0x022A, NES_SPROFFS }, { 0x0BF61, 0x000C, NES_SPROFFS } };
static const ScummNESFile::Resource res_sproffs_esp[2] = { { 0x2F447, 0x022A, NES_SPROFFS }, { 0x0BF6F, 0x000C, NES_SPROFFS } };
-#endif
+
static const ScummNESFile::Resource *res_sproffs[ScummNESFile::kROMsetNum] = {
res_sproffs_usa,
res_sproffs_eur,
@@ -832,14 +743,6 @@
res_sproffs_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_sprdata_usa;
-static const ScummNESFile::Resource *res_sprdata_eur;
-static const ScummNESFile::Resource *res_sprdata_swe;
-static const ScummNESFile::Resource *res_sprdata_fra;
-static const ScummNESFile::Resource *res_sprdata_ger;
-static const ScummNESFile::Resource *res_sprdata_esp;
-#else
// sprite data sets (packed NES sprite data)
static const ScummNESFile::Resource res_sprdata_usa[2] = { { 0x2CE11, 0x2BE0, NES_SPRDATA }, { 0x07F6B, 0x008A, NES_SPRDATA } };
static const ScummNESFile::Resource res_sprdata_eur[2] = { { 0x2CE11, 0x2BE0, NES_SPRDATA }, { 0x0BE28, 0x008A, NES_SPRDATA } };
@@ -855,23 +758,14 @@
res_sprdata_ger,
res_sprdata_esp,
};
-#endif
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_charset_usa;
-static const ScummNESFile::Resource *res_charset_eur;
-static const ScummNESFile::Resource *res_charset_swe;
-static const ScummNESFile::Resource *res_charset_fra;
-static const ScummNESFile::Resource *res_charset_ger;
-static const ScummNESFile::Resource *res_charset_esp;
-#else
static const ScummNESFile::Resource res_charset_usa[1] = { { 0x3F6EE, 0x0090, NES_CHARSET } };
static const ScummNESFile::Resource res_charset_eur[1] = { { 0x3F724, 0x0090, NES_CHARSET } };
static const ScummNESFile::Resource res_charset_swe[1] = { { 0x3F739, 0x0090, NES_CHARSET } };
static const ScummNESFile::Resource res_charset_fra[1] = { { 0x3F739, 0x0090, NES_CHARSET } };
static const ScummNESFile::Resource res_charset_ger[1] = { { 0x3F739, 0x0090, NES_CHARSET } };
static const ScummNESFile::Resource res_charset_esp[1] = { { 0x3F739, 0x0090, NES_CHARSET } };
-#endif
+
static const ScummNESFile::Resource *res_charset[ScummNESFile::kROMsetNum] = {
res_charset_usa,
res_charset_eur,
@@ -881,21 +775,13 @@
res_charset_esp,
};
-#ifdef PALMOS_68K
-static const ScummNESFile::Resource *res_preplist_usa;
-static const ScummNESFile::Resource *res_preplist_eur;
-static const ScummNESFile::Resource *res_preplist_swe;
-static const ScummNESFile::Resource *res_preplist_fra;
-static const ScummNESFile::Resource *res_preplist_ger;
-static const ScummNESFile::Resource *res_preplist_esp;
-#else
static const ScummNESFile::Resource res_preplist_usa[1] = { { 0x3FB5A, 0x000E, NES_PREPLIST } };
static const ScummNESFile::Resource res_preplist_eur[1] = { { 0x3FB90, 0x000E, NES_PREPLIST } };
static const ScummNESFile::Resource res_preplist_swe[1] = { { 0x3FBA9, 0x000E, NES_PREPLIST } };
static const ScummNESFile::Resource res_preplist_fra[1] = { { 0x3FBAF, 0x0010, NES_PREPLIST } };
static const ScummNESFile::Resource res_preplist_ger[1] = { { 0x3FBAB, 0x000F, NES_PREPLIST } };
static const ScummNESFile::Resource res_preplist_esp[1] = { { 0x3FBAE, 0x000F, NES_PREPLIST } };
-#endif
+
static const ScummNESFile::Resource *res_preplist[ScummNESFile::kROMsetNum] = {
res_preplist_usa,
res_preplist_eur,
Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/gfx.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -90,9 +90,6 @@
byte stripTable[16]; // ditto
};
-#ifdef PALMOS_68K
-static const TransitionEffect *transitionEffects;
-#else
static const TransitionEffect transitionEffects[6] = {
// Iris effect (looks like an opening/closing camera iris)
{
@@ -197,7 +194,6 @@
}
};
-#endif
Gdi::Gdi(ScummEngine *vm) : _vm(vm) {
@@ -3314,15 +3310,6 @@
* dissolveEffect(virtsrc[0].width, 1) produces a line-by-line dissolve
*/
void ScummEngine::dissolveEffect(int width, int height) {
-#ifdef PALMOS_68K
- // Remove this dissolve effect for now on PalmOS since it is a bit
- // too slow using 68k emulation
- if (width == 1 && height == 1) {
- waitForTimer(30);
- return;
- }
-#endif
-
VirtScreen *vs = &virtscr[0];
int *offsets;
int blits_before_refresh, blits;
@@ -3557,15 +3544,3 @@
} // End of namespace Scumm
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Gfx)
-_GSETPTR(Scumm::transitionEffects, GBVARS_TRANSITIONEFFECTS_INDEX, Scumm::TransitionEffect, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Gfx)
-_GRELEASEPTR(GBVARS_TRANSITIONEFFECTS_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -237,16 +237,6 @@
byte volume;
};
-#ifdef PALMOS_68K
-extern const imuseRoomMap *_digStateMusicMap;
-extern const imuseDigTable *_digStateMusicTable;
-extern const imuseDigTable *_digSeqMusicTable;
-extern const imuseComiTable *_comiStateMusicTable;
-extern const imuseComiTable *_comiSeqMusicTable;
-extern const imuseFtStateTable *_ftStateMusicTable;
-extern const imuseFtSeqTable *_ftSeqMusicTable;
-extern const imuseFtNames *_ftSeqNames;
-#else
extern const imuseRoomMap _digStateMusicMap[];
extern const imuseDigTable _digStateMusicTable[];
extern const imuseDigTable _digSeqMusicTable[];
@@ -255,7 +245,6 @@
extern const imuseFtStateTable _ftStateMusicTable[];
extern const imuseFtSeqTable _ftSeqMusicTable[];
extern const imuseFtNames _ftSeqNames[];
-#endif
} // End of namespace Scumm
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_codecs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_codecs.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_codecs.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -62,9 +62,6 @@
static byte _imcTableEntryBitCount[89];
-#ifdef PALMOS_68K
-static const int16 *imcTable;
-#else
static const int16 imcTable[89] = {
7, 8, 9, 10, 11, 12, 13, 14,
16, 17, 19, 21, 23, 25, 28, 31,
@@ -79,7 +76,6 @@
15289,16818,18500,20350,22385,24623,27086,29794,
32767
};
-#endif
static const byte imxOtherTable[6][64] = {
{
@@ -651,16 +647,3 @@
} // End of namespace BundleCodecs
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(DimuseCodecs)
-_GSETPTR(Scumm::BundleCodecs::imcTable, GBVARS_IMCTABLE_INDEX, int16, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(DimuseCodecs)
-_GRELEASEPTR(GBVARS_IMCTABLE_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_tables.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_tables.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_tables.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -27,16 +27,6 @@
namespace Scumm {
-#ifdef PALMOS_68K
-const imuseRoomMap *_digStateMusicMap;
-const imuseDigTable *_digStateMusicTable;
-const imuseDigTable *_digSeqMusicTable;
-const imuseComiTable *_comiStateMusicTable;
-const imuseComiTable *_comiSeqMusicTable;
-const imuseFtStateTable *_ftStateMusicTable;
-const imuseFtSeqTable *_ftSeqMusicTable;
-const imuseFtNames *_ftSeqNames;
-#else
const imuseRoomMap _digStateMusicMap[] = {
{0, 0, 0, 0, 0, 0 },
{1, 0, 0, 0, 0, 0 },
@@ -852,33 +842,5 @@
{"legavox", 2, 127},
{"chances", 2, 90 },
};
-#endif
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(DimuseTables)
-_GSETPTR(Scumm::_digStateMusicMap, GBVARS_DIGSTATEMUSICMAP_INDEX, Scumm::imuseRoomMap , GBVARS_SCUMM)
-_GSETPTR(Scumm::_digStateMusicTable, GBVARS_DIGSTATEMUSICTABLE_INDEX, Scumm::imuseDigTable , GBVARS_SCUMM)
-_GSETPTR(Scumm::_digSeqMusicTable, GBVARS_DIGSEQMUSICTABLE_INDEX, Scumm::imuseDigTable , GBVARS_SCUMM)
-_GSETPTR(Scumm::_comiStateMusicTable, GBVARS_COMISTATEMUSICTABLE_INDEX, Scumm::imuseComiTable , GBVARS_SCUMM)
-_GSETPTR(Scumm::_comiSeqMusicTable, GBVARS_COMISEQMUSICTABLE_INDEX, Scumm::imuseComiTable , GBVARS_SCUMM)
-_GSETPTR(Scumm::_ftStateMusicTable, GBVARS_FTSTATEMUSICTABLE_INDEX, Scumm::imuseFtStateTable, GBVARS_SCUMM)
-_GSETPTR(Scumm::_ftSeqMusicTable, GBVARS_FTSEQMUSICTABLE_INDEX, Scumm::imuseFtSeqTable , GBVARS_SCUMM)
-_GSETPTR(Scumm::_ftSeqNames, GBVARS_FTSEQNAMES_INDEX, Scumm::imuseFtNames , GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(DimuseTables)
-_GRELEASEPTR(GBVARS_DIGSTATEMUSICMAP_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_DIGSTATEMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_DIGSEQMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_COMISTATEMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_COMISEQMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FTSTATEMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FTSEQMUSICTABLE_INDEX , GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FTSEQNAMES_INDEX , GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/player_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/player_v2.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -44,16 +44,6 @@
#define FB_WNOISE 0x12000 /* feedback for white noise */
#define FB_PNOISE 0x08000 /* feedback for periodic noise */
-#ifdef PALMOS_68K
-const uint8 *note_lengths;
-static const uint16 *hull_offsets;
-static const int16 *hulls;
-static const uint16 *freqmod_lengths;
-static const uint16 *freqmod_offsets;
-static const int8 *freqmod_table;
-static const uint16 *spk_freq_table;
-static const uint16 *pcjr_freq_table;
-#else
const uint8 note_lengths[] = {
0,
0, 0, 2,
@@ -341,7 +331,6 @@
65472, 61760, 58304, 55040, 52032, 49024,
46272, 43648, 41216, 38912, 36736, 34624
};
-#endif
Player_V2::Player_V2(ScummEngine *scumm, Audio::Mixer *mixer, bool pcjr) {
@@ -977,30 +966,3 @@
}
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(PlayerV2)
-_GSETPTR(Scumm::note_lengths, GBVARS_NOTELENGTHS_INDEX, uint8, GBVARS_SCUMM)
-_GSETPTR(Scumm::hull_offsets, GBVARS_HULLOFFSETS_INDEX, uint16, GBVARS_SCUMM)
-_GSETPTR(Scumm::hulls, GBVARS_HULLS_INDEX, int16, GBVARS_SCUMM)
-_GSETPTR(Scumm::freqmod_lengths, GBVARS_FREQMODLENGTHS_INDEX, uint16, GBVARS_SCUMM)
-_GSETPTR(Scumm::freqmod_offsets, GBVARS_FREQMODOFFSETS_INDEX, uint16, GBVARS_SCUMM)
-_GSETPTR(Scumm::freqmod_table, GBVARS_FREQMODTABLE_INDEX, int8, GBVARS_SCUMM)
-_GSETPTR(Scumm::spk_freq_table, GBVARS_SPKFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
-_GSETPTR(Scumm::pcjr_freq_table, GBVARS_PCJRFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(PlayerV2)
-_GRELEASEPTR(GBVARS_NOTELENGTHS_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_HULLOFFSETS_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_HULLS_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FREQMODLENGTHS_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FREQMODOFFSETS_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_FREQMODTABLE_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_SPKFREQTABLE_INDEX, GBVARS_SCUMM)
-_GRELEASEPTR(GBVARS_PCJRFREQTABLE_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/player_v2a.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2a.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/player_v2a.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -32,12 +32,9 @@
#define BASE_FREQUENCY 3579545
-#ifdef PALMOS_68K
-static uint32 *CRCtable = NULL;
-#else
static uint32 CRCtable[256];
-#endif
+
static void InitCRC (void)
{
const uint32 poly = 0xEDB88320;
@@ -1309,9 +1306,6 @@
int i;
_vm = scumm;
-#ifdef PALMOS_68K
- if (!CRCtable) CRCtable = (uint32 *)calloc(256, sizeof(uint32));
-#endif
InitCRC();
for (i = 0; i < V2A_MAXSLOTS; i++) {
@@ -1325,9 +1319,6 @@
Player_V2A::~Player_V2A() {
delete _mod;
-#ifdef PALMOS_68K
- free(CRCtable);
-#endif
}
void Player_V2A::setMusicVolume (int vol) {
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -1197,12 +1197,7 @@
}
int maxHeapThreshold = -1;
-#ifdef PALMOS_68K
- if (_game.features & GF_NEW_COSTUMES)
- maxHeapThreshold = gVars->memory[kMemScummNewCostGames];
- else
- maxHeapThreshold = gVars->memory[kMemScummOldCostGames];
-#else
+
if (_game.features & GF_NEW_COSTUMES) {
// Since the new costumes are very big, we increase the heap limit, to avoid having
// to constantly reload stuff from the data files.
@@ -1210,7 +1205,7 @@
} else {
maxHeapThreshold = 550000;
}
-#endif
+
_res->setHeapThreshold(400000, maxHeapThreshold);
#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
Modified: scummvm/trunk/engines/scumm/smush/codec47.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/codec47.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/smush/codec47.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -88,9 +88,6 @@
0, 0, 0, 0, 1, 3, 4, 6, 7, 7, 7, 7, 6, 4, 3, 1,
};
-#ifdef PALMOS_68K
-static const int8 *codec47_table;
-#else
static const int8 codec47_table[] = {
0, 0, -1, -43, 6, -43, -9, -42, 13, -41,
-16, -40, 19, -39, -23, -36, 26, -34, -2, -33,
@@ -144,7 +141,6 @@
23, 36, -19, 39, 16, 40, -13, 41, 9, 42,
-6, 43, 1, 43, 0, 0, 0, 0, 0, 0
};
-#endif
void Codec47Decoder::makeTablesInterpolation(int param) {
int32 variable1, variable2;
@@ -617,16 +613,3 @@
}
} // End of namespace Scumm
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Codec47)
-_GSETPTR(Scumm::codec47_table, GBVARS_CODEC47TABLE_INDEX, int8, GBVARS_SCUMM)
-_GEND
-
-_GRELEASE(Codec47)
-_GRELEASEPTR(GBVARS_CODEC47TABLE_INDEX, GBVARS_SCUMM)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/scumm/thumbnail.cpp
===================================================================
--- scummvm/trunk/engines/scumm/thumbnail.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/scumm/thumbnail.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -99,7 +99,7 @@
void ScummEngine::saveThumbnail(Common::OutSaveFile *file) {
Graphics::Surface thumb;
-#if !defined(PALMOS_68K) || !defined(__DS__)
+#if !defined(__DS__)
if (!createThumbnailFromScreen(&thumb))
#endif
thumb.create(kThumbnailWidth, kThumbnailHeight2, sizeof(uint16));
Modified: scummvm/trunk/engines/sky/hufftext.cpp
===================================================================
--- scummvm/trunk/engines/sky/hufftext.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/sky/hufftext.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -27,17 +27,6 @@
namespace Sky {
-#ifdef PALMOS_68K
-const HuffTree *Text::_huffTree_00109;
-const HuffTree *Text::_huffTree_00267;
-const HuffTree *Text::_huffTree_00288;
-const HuffTree *Text::_huffTree_00303;
-const HuffTree *Text::_huffTree_00331;
-const HuffTree *Text::_huffTree_00348;
-const HuffTree *Text::_huffTree_00365;
-const HuffTree *Text::_huffTree_00368;
-const HuffTree *Text::_huffTree_00372;
-#else
const HuffTree Text::_huffTree_00109[] = {
{ 1, 22, 0 },
{ 2, 9, 0 },
@@ -2015,35 +2004,5 @@
{ 0, 0, 148 },
{ 0, 0, '!' },
};
-#endif
} // End of namespace Sky
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(Sky_Hufftext)
-_GSETPTR(Sky::Text::_huffTree_00109, GBVARS_HUFFTREE_00109_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00267, GBVARS_HUFFTREE_00267_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00288, GBVARS_HUFFTREE_00288_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00303, GBVARS_HUFFTREE_00303_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00331, GBVARS_HUFFTREE_00331_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00348, GBVARS_HUFFTREE_00348_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00365, GBVARS_HUFFTREE_00365_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00368, GBVARS_HUFFTREE_00368_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GSETPTR(Sky::Text::_huffTree_00372, GBVARS_HUFFTREE_00372_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
-_GEND
-
-_GRELEASE(Sky_Hufftext)
-_GRELEASEPTR(GBVARS_HUFFTREE_00109_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00267_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00288_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00303_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00331_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00348_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00365_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00368_INDEX, GBVARS_QUEEN)
-_GRELEASEPTR(GBVARS_HUFFTREE_00372_INDEX, GBVARS_QUEEN)
-_GEND
-
-#endif
Modified: scummvm/trunk/engines/sky/text.h
===================================================================
--- scummvm/trunk/engines/sky/text.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/sky/text.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -96,7 +96,6 @@
static const uint16 _patchLangIdx[8];
static const uint16 _patchLangNum[8];
-#ifndef PALMOS_68K
static const HuffTree _huffTree_00109[]; // trees moved to hufftext.cpp
static const HuffTree _huffTree_00267[];
static const HuffTree _huffTree_00288[];
@@ -106,18 +105,6 @@
static const HuffTree _huffTree_00365[];
static const HuffTree _huffTree_00368[];
static const HuffTree _huffTree_00372[];
-#else
-public:
- static const HuffTree *_huffTree_00109; // trees moved to hufftext.cpp
- static const HuffTree *_huffTree_00267;
- static const HuffTree *_huffTree_00288;
- static const HuffTree *_huffTree_00303;
- static const HuffTree *_huffTree_00331;
- static const HuffTree *_huffTree_00348;
- static const HuffTree *_huffTree_00365;
- static const HuffTree *_huffTree_00368;
- static const HuffTree *_huffTree_00372;
-#endif
};
} // End of namespace Sky
Modified: scummvm/trunk/engines/sword1/sound.h
===================================================================
--- scummvm/trunk/engines/sword1/sound.h 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/sword1/sound.h 2007-09-01 19:13:04 UTC (rev 28803)
@@ -118,12 +118,8 @@
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
Modified: scummvm/trunk/engines/sword1/staticres.cpp
===================================================================
--- scummvm/trunk/engines/sword1/staticres.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/engines/sword1/staticres.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -2894,9 +2894,6 @@
"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 @@
},
//------------------------
};
-#endif
+
//--------------------------------------------------------------------------------------
// Continuous & random background sound effects for each location
@@ -7156,16 +7153,3 @@
};
} // 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
Modified: scummvm/trunk/graphics/fonts/scummfont.cpp
===================================================================
--- scummvm/trunk/graphics/fonts/scummfont.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/graphics/fonts/scummfont.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -27,9 +27,6 @@
namespace Graphics {
-#ifdef PALMOS_68K
-static const byte *guifont;
-#else
// Built-in font
static const byte guifont[] = {
// Header
@@ -279,7 +276,6 @@
28, 54, 54, 124, 102, 102, 124, 64, // 225
0, 0, 0 // ???
};
-#endif
int ScummFont::getCharWidth(byte chr) const {
return guifont[chr+6];
@@ -318,16 +314,3 @@
}
} // End of namespace Graphics
-
-#ifdef PALMOS_68K
-#include "scumm_globals.h"
-
-_GINIT(ScummFont)
-_GSETPTR(Graphics::guifont, GBVARS_GUIFONT_INDEX, byte, GBVARS_COMMON)
-_GEND
-
-_GRELEASE(ScummFont)
-_GRELEASEPTR(GBVARS_GUIFONT_INDEX, GBVARS_COMMON)
-_GEND
-
-#endif
Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp 2007-09-01 19:08:16 UTC (rev 28802)
+++ scummvm/trunk/sound/fmopl.cpp 2007-09-01 19:13:04 UTC (rev 28803)
@@ -183,12 +183,9 @@
/* envelope output curve table */
/* attack + decay + OFF */
//static int ENV_CURVE[2*EG_ENT+1];
-#ifndef PALMOS_68K
static int ENV_CURVE[2 * 4096 + 1]; // to keep it static ...
-#else
-static int *ENV_CURVE = NULL; // to keep it static ...
-#endif
+
/* multiple table */
#define ML(a) (int)(a * 2)
static const uint MUL_TABLE[16]= {
@@ -636,11 +633,6 @@
int i,j;
double pom;
-#ifdef PALMOS_68K
- if (!ENV_CURVE)
- ENV_CURVE = (int *)calloc(2 * 4096 + 1, sizeof(int));
-#endif
-
#ifdef __DS__
DS::fastRamReset();
@@ -732,10 +724,6 @@
free(SIN_TABLE);
free(AMS_TABLE);
free(VIB_TABLE);
-#ifdef PALMOS_68K
- free(ENV_CURVE);
- ENV_CURVE = NULL;
-#endif
}
/* CSM Key Controll */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list