diff options
| author | Chris Apers | 2005-11-05 19:26:26 +0000 |
|---|---|---|
| committer | Chris Apers | 2005-11-05 19:26:26 +0000 |
| commit | 57698a16abf87761d5fecbeaee6714b3587ec64e (patch) | |
| tree | a717b38b3b4e3dcc23cb361406f56fc3fadaa63e /sword1 | |
| parent | cb12c0c1da39b8be9054e3debb5108846a354bae (diff) | |
| download | scummvm-rg350-57698a16abf87761d5fecbeaee6714b3587ec64e.tar.gz scummvm-rg350-57698a16abf87761d5fecbeaee6714b3587ec64e.tar.bz2 scummvm-rg350-57698a16abf87761d5fecbeaee6714b3587ec64e.zip | |
PalmOS ifdef
svn-id: r19475
Diffstat (limited to 'sword1')
| -rw-r--r-- | sword1/control.cpp | 6 | ||||
| -rw-r--r-- | sword1/credits.cpp | 3 | ||||
| -rw-r--r-- | sword1/sound.h | 2 | ||||
| -rw-r--r-- | sword1/staticres.cpp | 4 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/sword1/control.cpp b/sword1/control.cpp index a05a46f34d..c19b98843b 100644 --- a/sword1/control.cpp +++ b/sword1/control.cpp @@ -1066,7 +1066,7 @@ void Control::delay(uint32 msecs) { case OSystem::EVENT_LBUTTONDOWN: _mouseDown = true; _mouseState |= BS1L_BUTTON_DOWN; -#if defined(_WIN32_WCE) || defined(__PALM_OS__) +#if defined(_WIN32_WCE) || defined(PALMOS_MODE) _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif @@ -1094,9 +1094,8 @@ void Control::delay(uint32 msecs) { _keyRepeatTime += kKeyRepeatSustainDelay; _keyPressed = _keyRepeat; } -#ifndef __PALM_OS__ + _system->delayMillis(10); -#endif } while (_system->getMillis() < endTime); } @@ -1293,4 +1292,3 @@ const uint8 Control::_languageStrings[8 * 20][43] = { }; } // End of namespace Sword1 - diff --git a/sword1/credits.cpp b/sword1/credits.cpp index 9a8d42eb4e..691eaaa4c2 100644 --- a/sword1/credits.cpp +++ b/sword1/credits.cpp @@ -286,10 +286,9 @@ void CreditsPlayer::delay(int msecs) { } } -#ifndef __PALM_OS__ if (msecs > 0) _system->delayMillis(10); -#endif + } while ((_system->getMillis() < start + msecs) && !SwordEngine::_systemVars.engineQuit); } diff --git a/sword1/sound.h b/sword1/sound.h index 7f5769d539..1412adbf82 100644 --- a/sword1/sound.h +++ b/sword1/sound.h @@ -113,7 +113,7 @@ private: char _filePath[100]; static const char _musicList[270]; static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM]; -#ifdef __PALM_OS__ +#ifdef PALMOS_68K public: static const FxDef *_fxList; #else diff --git a/sword1/staticres.cpp b/sword1/staticres.cpp index 25a512b6d7..75b372bbf0 100644 --- a/sword1/staticres.cpp +++ b/sword1/staticres.cpp @@ -2890,7 +2890,7 @@ 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 __PALM_OS__ +#ifdef PALMOS_68K const FxDef *Sound::_fxList; #else const FxDef Sound::_fxList[312] = { @@ -7153,7 +7153,7 @@ const uint8 *Logic::_helperData[] = { } // End of namespace Sword1 -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "scumm_globals.h" _GINIT(Sword1_fxList) diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 4e6a480a73..0628ade213 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -579,14 +579,14 @@ void SwordEngine::delay(int32 amount) { //copied and mutilated from sky.cpp break; case OSystem::EVENT_LBUTTONDOWN: _mouseState |= BS1L_BUTTON_DOWN; -#if defined(_WIN32_WCE) || defined(__PALM_OS__) +#if defined(_WIN32_WCE) || defined(PALMOS_MODE) _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif break; case OSystem::EVENT_RBUTTONDOWN: _mouseState |= BS1R_BUTTON_DOWN; -#if defined(_WIN32_WCE) || defined(__PALM_OS__) +#if defined(_WIN32_WCE) || defined(PALMOS_MODE) _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif |