From 58120f07cc04764569ffd3c736a6d31583ea3239 Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Sat, 5 Nov 2005 18:12:41 +0000 Subject: Changed PalmOS ifdef svn-id: r19467 --- queen/display.cpp | 12 ++++++------ queen/display.h | 2 +- queen/graphics.h | 6 +++--- queen/musicdata.cpp | 4 ++-- queen/resource.cpp | 6 +++--- queen/resource.h | 2 +- queen/restables.cpp | 2 +- queen/sound.cpp | 2 +- queen/sound.h | 2 +- queen/talk.cpp | 6 +++--- queen/talk.h | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/queen/display.cpp b/queen/display.cpp index b97af49ed1..7eb19d43e0 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -28,14 +28,14 @@ #include "queen/queen.h" #include "queen/resource.h" -#if defined(__PALM_OS__) +#if defined(PALMOS_68K) #include "arm/native.h" #include "arm/macros.h" #endif namespace Queen { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K static const uint8 *_fontRegular; static const uint8 *_fontHebrew; static const uint8 *_palJoeClothes; @@ -569,7 +569,7 @@ void Display::prepareUpdate() { uint8 *dst = _screenBuf; const uint8 *src = _backdropBuf + _horizontalScroll; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K ARM_START(CopyRectangleType) ARM_INIT(COMMON_COPYRECT) ARM_ADDM(dst) @@ -696,7 +696,7 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin assert(w <= dstPitch); dstBuf += dstPitch * y + x; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K ARM_CHECK_EXEC(w > 8 && h > 8) ARM_START(BlitType) ARM_INIT(QUEEN_BLIT) @@ -1044,7 +1044,7 @@ void Display::blankScreenEffect3() { } } -#ifndef __PALM_OS__ +#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, @@ -1323,7 +1323,7 @@ const uint8 Display::_palJoeDress[] = { } // End of namespace Queen -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Queen_Display) diff --git a/queen/display.h b/queen/display.h index 1abf939a30..c4d7671a32 100644 --- a/queen/display.h +++ b/queen/display.h @@ -234,7 +234,7 @@ private: QueenEngine *_vm; const uint8 *_font; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K static const uint8 _fontRegular[]; static const uint8 _fontHebrew[]; static const uint8 _palJoeClothes[]; diff --git a/queen/graphics.h b/queen/graphics.h index aa3df822bd..03cd4f1e31 100644 --- a/queen/graphics.h +++ b/queen/graphics.h @@ -257,7 +257,7 @@ private: int16 frame; }; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K public: #endif struct BamDataBlock { @@ -266,7 +266,7 @@ public: BamDataObj fx; int16 sfx; }; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K private: #endif @@ -279,7 +279,7 @@ private: QueenEngine *_vm; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K static const BamDataBlock _carData[]; static const BamDataBlock _fight1Data[]; static const BamDataBlock _fight2Data[]; diff --git a/queen/musicdata.cpp b/queen/musicdata.cpp index d099bbb3b1..53622c02b1 100644 --- a/queen/musicdata.cpp +++ b/queen/musicdata.cpp @@ -24,7 +24,7 @@ namespace Queen { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K const songData *Sound::_songDemo; const songData *Sound::_song; @@ -1919,7 +1919,7 @@ const int16 Sound::_jungleList[] = { 15, 16, 17, 18, 7, 8, 9, 10, 11, 12, 13, 14 } // End of namespace Queen -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Queen_Musicdata) diff --git a/queen/resource.cpp b/queen/resource.cpp index 7d6bc78498..fb2f32fb19 100644 --- a/queen/resource.cpp +++ b/queen/resource.cpp @@ -24,7 +24,7 @@ namespace Queen { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K static ResourceEntry *_resourceTablePEM10; #endif @@ -81,7 +81,7 @@ ResourceEntry *Resource::resourceEntry(const char *filename) const { while (*ptr++); ResourceEntry *re = NULL; -#ifndef __PALM_OS__ +#ifndef PALMOS_MODE re = (ResourceEntry *)bsearch(entryName, _resourceTable, _resourceEntries, sizeof(ResourceEntry), compareResourceEntry); #else // PALMOS FIXME (?) : still doesn't work for me (????) use this instead @@ -269,7 +269,7 @@ char *LineReader::nextLine() { } // End of namespace Queen -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Queen_Restables) diff --git a/queen/resource.h b/queen/resource.h index ab9320a49b..0d7f4fd7e7 100644 --- a/queen/resource.h +++ b/queen/resource.h @@ -157,7 +157,7 @@ protected: //! known FOTAQ versions static const GameVersion _gameVersions[]; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K //! resource table for english floppy version static ResourceEntry _resourceTablePEM10[]; #endif diff --git a/queen/restables.cpp b/queen/restables.cpp index 4c53088624..9c0dbfc259 100644 --- a/queen/restables.cpp +++ b/queen/restables.cpp @@ -23,7 +23,7 @@ namespace Queen { -#ifndef __PALM_OS__ +#ifndef PALMOS_68K //English Floppy Version ResourceEntry Resource::_resourceTablePEM10[] = { { "1000SSSS.SB", 1, 0x00000000, 0x000027fe }, diff --git a/queen/sound.cpp b/queen/sound.cpp index 2c5b16b6a8..97ca635321 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -96,7 +96,7 @@ void Sound::playSfx(uint16 sfx, bool isSpeech) { if (sfx != 0) { char name[13]; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K strcpy(name, _sfxName[sfx - 1]); #else strncpy(name, _sfxName + 10 * (sfx - 1), 10); // saved as 8char + /0/0 diff --git a/queen/sound.h b/queen/sound.h index 5150d72a29..8a70a17717 100644 --- a/queen/sound.h +++ b/queen/sound.h @@ -84,7 +84,7 @@ public: void saveState(byte *&ptr); void loadState(uint32 ver, byte *&ptr); -#ifndef __PALM_OS__ +#ifndef PALMOS_68K static const songData _songDemo[]; static const songData _song[]; static const tuneData _tuneDemo[]; diff --git a/queen/talk.cpp b/queen/talk.cpp index 6a990b39f9..bd55b10135 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -38,7 +38,7 @@ namespace Queen { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K static const Talk::SpeechParameters *_speechParameters; #endif @@ -1332,7 +1332,7 @@ int16 Talk::selectSentence() { return selectedSentence; } -#ifndef __PALM_OS__ +#ifndef PALMOS_68K const Talk::SpeechParameters Talk::_speechParameters[] = { { "JOE", 0, 1, 1, 10, 2, 3, "", 0 }, { "JOE", 0, 3, 3, 28, 2, 3, "", 0 }, @@ -1797,7 +1797,7 @@ const Talk::SpeechParameters Talk::_speechParameters[] = { } // End of namespace Queen -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Queen_Talk) diff --git a/queen/talk.h b/queen/talk.h index aec02c4b77..28808e88ee 100644 --- a/queen/talk.h +++ b/queen/talk.h @@ -77,7 +77,7 @@ private: int16 gameStateValue; }; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K struct SpeechParameters { const char *name; signed char state,faceDirection; @@ -150,7 +150,7 @@ private: char _talkString[5][MAX_STRING_SIZE]; char _joeVoiceFilePrefix[5][MAX_STRING_SIZE]; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K static const SpeechParameters _speechParameters[]; #endif -- cgit v1.2.3