Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)

svn-id: r28803

12 files changed, 4 insertions, 170 deletions

diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp
index a8c2747753..9c4101f1d3 100644
--- a/engines/queen/display.cpp
+++ b/engines/queen/display.cpp
@@ -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 @@ void Display::blankScreenEffect3() {
 	}
 }
 
-#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 @@ const uint8 Display::_palJoeDress[] = {
 	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
diff --git a/engines/queen/display.h b/engines/queen/display.h
index 23316f880a..b26ae1fac0 100644
--- a/engines/queen/display.h
+++ b/engines/queen/display.h
@@ -254,13 +254,12 @@ private:
 	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
 };
 
 
diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp
index 4beca6556d..6199a75e7c 100644
--- a/engines/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
@@ -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 @@ void BamScene::loadState(uint32 ver, byte *&ptr) {
 	_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 @@ const BamScene::BamDataBlock BamScene::_fight4Data[] = {
 	{ {  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
diff --git a/engines/queen/graphics.h b/engines/queen/graphics.h
index 3963224069..9684217ef0 100644
--- a/engines/queen/graphics.h
+++ b/engines/queen/graphics.h
@@ -261,18 +261,12 @@ private:
 		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 @@ private:
 
 	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
diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp
index bfb843766c..a0b2a73697 100644
--- a/engines/queen/musicdata.cpp
+++ b/engines/queen/musicdata.cpp
@@ -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 char *Sound::_sfxName[] = {
 };
 
 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
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index 999a86d432..20b047cb71 100644
--- a/engines/queen/resource.cpp
+++ b/engines/queen/resource.cpp
@@ -30,9 +30,6 @@
 
 namespace Queen {
 
-#ifdef PALMOS_68K
-static ResourceEntry *_resourceTablePEM10;
-#endif
 
 const char *Resource::_tableFilename = "queen.tbl";
 
@@ -325,16 +322,3 @@ Common::File *Resource::findSound(const char *filename, uint32 *size) {
 }
 
 } // 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
diff --git a/engines/queen/resource.h b/engines/queen/resource.h
index 16094193d9..43c8e68939 100644
--- a/engines/queen/resource.h
+++ b/engines/queen/resource.h
@@ -165,10 +165,8 @@ protected:
 	//! known FOTAQ versions
 	static const RetailGameVersion _gameVersions[];
 
-#ifndef PALMOS_68K
 	//! resource table for english floppy version
 	static ResourceEntry _resourceTablePEM10[];
-#endif
 };
 
 } // End of namespace Queen
diff --git a/engines/queen/restables.cpp b/engines/queen/restables.cpp
index 721bde626f..d4c30c7bea 100644
--- a/engines/queen/restables.cpp
+++ b/engines/queen/restables.cpp
@@ -27,7 +27,6 @@
 
 namespace Queen {
 
-#ifndef PALMOS_68K
 //English Floppy Version
 ResourceEntry Resource::_resourceTablePEM10[] = {
 	{ "1000SSSS.SB", 1, 0x00000000, 0x000027fe },
@@ -1107,5 +1106,5 @@ ResourceEntry Resource::_resourceTablePEM10[] = {
 	{ "ZOMBIE1.DOG", 1, 0x0159ecef, 0x00000f6a },
 	{ "ZOMBIE2.DOG", 1, 0x0159fc59, 0x00000c40 }
 };
-#endif
+
 } // End of namespace Queen
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index a4cac2417e..1da07cf97c 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -173,13 +173,8 @@ PCSound::~PCSound() {
 }
 
 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) {
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index 145a2d1384..d87ab63a18 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -103,21 +103,12 @@ public:
 	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:
 
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index a47584a003..8396356685 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -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 @@ int16 Talk::selectSentence() {
 	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 @@ const Talk::SpeechParameters Talk::_speechParameters[] = {
 
 	{ "*", 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
diff --git a/engines/queen/talk.h b/engines/queen/talk.h
index 1548d0ba27..036dfadbcd 100644
--- a/engines/queen/talk.h
+++ b/engines/queen/talk.h
@@ -81,7 +81,6 @@ private:
 		int16 gameStateValue;
 	};
 
-#ifndef PALMOS_68K
 	struct SpeechParameters {
 		const char *name;
 		signed char state,faceDirection;
@@ -89,17 +88,6 @@ private:
 		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 @@ private:
 	char _talkString[5][MAX_STRING_SIZE];
 	char _joeVoiceFilePrefix[5][MAX_STRING_SIZE];
 
-#ifndef PALMOS_68K
 	static const SpeechParameters _speechParameters[];
-#endif
 
 	Talk(QueenEngine *vm);
 	~Talk();