diff options
| author | Chris Apers | 2005-11-05 19:00:15 +0000 |
|---|---|---|
| committer | Chris Apers | 2005-11-05 19:00:15 +0000 |
| commit | 35748cfe92afabbd5b97aa837e70dd9d545ef069 (patch) | |
| tree | bbc82c0da44492e130657b0726c01d33ad722c29 | |
| parent | 54c47e3985f638caf34eaf432aa19e55fe91a74c (diff) | |
| download | scummvm-rg350-35748cfe92afabbd5b97aa837e70dd9d545ef069.tar.gz scummvm-rg350-35748cfe92afabbd5b97aa837e70dd9d545ef069.tar.bz2 scummvm-rg350-35748cfe92afabbd5b97aa837e70dd9d545ef069.zip | |
PalmOS ifdef
svn-id: r19473
| -rw-r--r-- | sky/control.cpp | 2 | ||||
| -rw-r--r-- | sky/disk.cpp | 6 | ||||
| -rw-r--r-- | sky/hufftext.cpp | 4 | ||||
| -rw-r--r-- | sky/sky.cpp | 4 | ||||
| -rw-r--r-- | sky/text.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sky/control.cpp b/sky/control.cpp index 3a6f205f30..d94ba02cc6 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -1523,7 +1523,7 @@ void Control::delay(unsigned int amount) { _mouseY = event.mouse.y; break; case OSystem::EVENT_LBUTTONDOWN: -#ifdef __PALM_OS__ +#ifdef PALMOS_MODE _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif diff --git a/sky/disk.cpp b/sky/disk.cpp index 5ccdc1ed95..005a122f16 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -28,7 +28,7 @@ #include "sky/sky.h" #include "sky/struc.h" -#if defined(__PALM_OS__) +#if defined(PALMOS_68K) #include "arm/native.h" #include "arm/macros.h" #endif @@ -164,7 +164,7 @@ uint8 *Disk::loadFile(uint16 fileNr) { if ((fileFlags >> 22) & 0x1) { //do we include the header? // don't return the file's header output = uncompDest; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K ARM_START(RncDecoderType) ARM_INIT(SKY_UNPACKM1) ARM_ADDM(input) @@ -184,7 +184,7 @@ uint8 *Disk::loadFile(uint16 fileNr) { memcpy(uncompDest, fileDest, sizeof(dataFileHeader)); output = uncompDest + sizeof(dataFileHeader); -#ifdef __PALM_OS__ +#ifdef PALMOS_68K ARM_START(RncDecoderType) ARM_INIT(SKY_UNPACKM1) ARM_ADDM(input) diff --git a/sky/hufftext.cpp b/sky/hufftext.cpp index 3b402bf3eb..95bd79170b 100644 --- a/sky/hufftext.cpp +++ b/sky/hufftext.cpp @@ -23,7 +23,7 @@ namespace Sky { -#ifdef __PALM_OS__ +#ifdef PALMOS_68K const HuffTree *Text::_huffTree_00109; const HuffTree *Text::_huffTree_00267; const HuffTree *Text::_huffTree_00288; @@ -2015,7 +2015,7 @@ const HuffTree Text::_huffTree_00372[] = { } // End of namespace Sky -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Sky_Hufftext) diff --git a/sky/sky.cpp b/sky/sky.cpp index 6b5ef161c3..c31abb42ac 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -472,14 +472,14 @@ void SkyEngine::delay(int32 amount) { } break; case OSystem::EVENT_LBUTTONDOWN: -#ifdef __PALM_OS__ +#ifdef PALMOS_MODE _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif _skyMouse->buttonPressed(2); break; case OSystem::EVENT_RBUTTONDOWN: -#ifdef __PALM_OS__ +#ifdef PALMOS_MODE _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif diff --git a/sky/text.h b/sky/text.h index 4da642bb15..561d824f2f 100644 --- a/sky/text.h +++ b/sky/text.h @@ -103,7 +103,7 @@ protected: bool _dtCentre; //set for centre text uint32 _lowTextWidth, _mouseOfsX, _mouseOfsY; -#ifndef __PALM_OS__ +#ifndef PALMOS_68K static const HuffTree _huffTree_00109[]; // trees moved to hufftext.cpp static const HuffTree _huffTree_00267[]; static const HuffTree _huffTree_00288[]; |