diff options
author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /backends/platform/PalmOS | |
parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'backends/platform/PalmOS')
47 files changed, 249 insertions, 249 deletions
diff --git a/backends/platform/PalmOS/Src/base_event.cpp b/backends/platform/PalmOS/Src/base_event.cpp index fb136d92e5..81eeb4e79c 100644 --- a/backends/platform/PalmOS/Src/base_event.cpp +++ b/backends/platform/PalmOS/Src/base_event.cpp @@ -208,7 +208,7 @@ bool OSystem_PalmBase::pollEvent(Common::Event &event) { sy = -1; else if (keyCurrentState & _keyExtra.bitDown) sy = +1; - + if (keyCurrentState & _keyExtra.bitLeft) sx = -1; else if (keyCurrentState & _keyExtra.bitRight) @@ -222,7 +222,7 @@ bool OSystem_PalmBase::pollEvent(Common::Event &event) { warpMouse(x, y); return true; - } + } } } @@ -293,7 +293,7 @@ bool OSystem_PalmBase::pollEvent(Common::Event &event) { k = Common::KEYCODE_RIGHT; break; case chrLeftArrow: k = Common::KEYCODE_LEFT; break; - + // return case chrLineFeed: case chrCarriageReturn: @@ -314,10 +314,10 @@ bool OSystem_PalmBase::pollEvent(Common::Event &event) { return true; // prevent crash when alarm is raised - handled = ((ev.eType == keyDownEvent) && - (ev.data.keyDown.modifiers & commandKeyMask) && - ((ev.data.keyDown.chr == vchrAttnStateChanged) || - (ev.data.keyDown.chr == vchrAttnUnsnooze))); + handled = ((ev.eType == keyDownEvent) && + (ev.data.keyDown.modifiers & commandKeyMask) && + ((ev.data.keyDown.chr == vchrAttnStateChanged) || + (ev.data.keyDown.chr == vchrAttnUnsnooze))); // graffiti strokes, auto-off, etc... if (!handled) diff --git a/backends/platform/PalmOS/Src/base_gfx.cpp b/backends/platform/PalmOS/Src/base_gfx.cpp index cee1329308..c96a258d52 100644 --- a/backends/platform/PalmOS/Src/base_gfx.cpp +++ b/backends/platform/PalmOS/Src/base_gfx.cpp @@ -99,7 +99,7 @@ void OSystem_PalmBase::setPalette(const byte *colors, uint start, uint num) { base[i].r = colors[0]; base[i].g = colors[1]; base[i].b = colors[2]; - + extras_palette(i + start, colors[0], colors[1], colors[2]); colors += 4; } @@ -134,7 +134,7 @@ void OSystem_PalmBase::setShakePos(int shakeOffset) { void OSystem_PalmBase::updateScreen() { // Check whether the palette was changed in the meantime and update the - // screen surface accordingly. + // screen surface accordingly. if (_paletteDirtyEnd != 0 && _setPalette) { WinSetDrawWindow(WinGetDisplayWindow()); WinPalette(winPaletteSet, _paletteDirtyStart, _paletteDirtyEnd - _paletteDirtyStart, _currentPalette + _paletteDirtyStart); diff --git a/backends/platform/PalmOS/Src/base_mouse.cpp b/backends/platform/PalmOS/Src/base_mouse.cpp index 7af080e09d..93a1fd2209 100644 --- a/backends/platform/PalmOS/Src/base_mouse.cpp +++ b/backends/platform/PalmOS/Src/base_mouse.cpp @@ -54,10 +54,10 @@ void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotsp if (_mouseCurState.w != w || _mouseCurState.h != h) { _mouseCurState.w = w; _mouseCurState.h = h; - + if (_mouseDataP) free(_mouseDataP); - + if (_mouseBackupP) free(_mouseBackupP); @@ -95,7 +95,7 @@ void OSystem_PalmBase::simulate_mouse(Common::Event &event, Int8 iHoriz, Int8 iV x = (x >= _screenWidth ) ? _screenWidth - 1 : x; y = (y < 0 ) ? 0 : y; y = (y >= _screenHeight ) ? _screenHeight - 1 : y; - + *xr = x; *yr = y; } diff --git a/backends/platform/PalmOS/Src/be_base.cpp b/backends/platform/PalmOS/Src/be_base.cpp index e85ba03ef1..3dadbe5286 100644 --- a/backends/platform/PalmOS/Src/be_base.cpp +++ b/backends/platform/PalmOS/Src/be_base.cpp @@ -45,13 +45,13 @@ OSystem_PalmBase::OSystem_PalmBase() { _mode = _setMode; _redawOSD = false; _setPalette = true; - + _offScreenH = NULL; _screenH = NULL; _offScreenP = NULL; _screenP = NULL; _screenPitch = gVars->screenPitch; - + _wasKey = false; _lastKeyModifier = kModifierNone; _lastKeyRepeat = 100; @@ -59,11 +59,11 @@ OSystem_PalmBase::OSystem_PalmBase() { _showBatLow = false; _batCheckTicks = SysTicksPerSecond() * 15; _batCheckLast = TimGetTicks(); - + _saveMgr = 0; _timerMgr = 0; _mixerMgr = 0; - + _mouseDataP = NULL; _mouseBackupP = NULL; _mouseVisible = false; @@ -73,7 +73,7 @@ OSystem_PalmBase::OSystem_PalmBase() { MemSet(&_mouseOldState, sizeof(_mouseOldState), 0); MemSet(&_timer, sizeof(TimerType), 0); MemSet(&_sound, sizeof(SoundType), 0); - + _keyExtraRepeat = 0; _keyExtraPressed = 0; _keyExtraDelay = (gVars->arrowKeys) ? computeMsecs(125) : computeMsecs(25); @@ -136,7 +136,7 @@ void OSystem_PalmBase::setTimerCallback(TimerProc callback, int timer) { _timer.duration = timer; _timer.nextExpiry = getMillis() + timer; _timer.callback = callback; - _timer.active = true; + _timer.active = true; } else { _timer.active = false; } @@ -155,7 +155,7 @@ void OSystem_PalmBase::quit() { delete _saveMgr; delete _timerMgr; delete _mixerMgr; - + exit(0); } diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h index a4c27cf2da..38b76fcb05 100644 --- a/backends/platform/PalmOS/Src/be_base.h +++ b/backends/platform/PalmOS/Src/be_base.h @@ -90,7 +90,7 @@ typedef struct { class OSystem_PalmBase : public OSystem { private: virtual void int_initBackend() { } - + virtual const GraphicsMode *int_getSupportedGraphicsModes() const; virtual void int_updateScreen() = 0; virtual void int_initSize(uint w, uint h) = 0; @@ -104,9 +104,9 @@ private: virtual void draw_mouse() = 0; virtual void undraw_mouse() = 0; - + virtual bool check_event(Common::Event &event, EventPtr ev) = 0; - + virtual void timer_handler(); void battery_handler(); virtual void get_coordinates(EventPtr ev, Coord &x, Coord &y) = 0; @@ -134,12 +134,12 @@ protected: RGBColorType _currentPalette[256]; uint _paletteDirtyStart, _paletteDirtyEnd; - + int _mode, _setMode; int16 _screenWidth, _screenHeight; Boolean _modeChanged, _gfxLoaded; UInt32 _screenPitch; - + PointType _screenOffset; struct { Coord w, h; @@ -162,7 +162,7 @@ protected: UInt32 bitActionA; // left mouse button UInt32 bitActionB; // right mouse button } _keyExtra; - + bool _mouseVisible; bool _mouseDrawn; MousePos _mouseCurState; @@ -171,14 +171,14 @@ protected: int16 _mouseHotspotY; byte _mouseKeyColor; byte *_mouseDataP, *_mouseBackupP; - + bool _wasKey; UInt8 _lastKeyModifier; UInt32 _lastKeyRepeat; Boolean _useNumPad, _showBatLow; UInt32 _batCheckTicks, _batCheckLast; - + int _samplesPerSec; public: @@ -190,19 +190,19 @@ public: bool hasFeature(Feature f); bool getFeatureState(Feature f); - + virtual void beginGFXTransaction(); virtual void endGFXTransaction(); - + virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); - + virtual OverlayColor ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b); virtual void colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b); - + virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual void disableCursorPalette(bool disable); - + virtual void displayMessageOnOSD(const char *msg); */ const GraphicsMode *getSupportedGraphicsModes() const; @@ -233,25 +233,25 @@ public: void grabPalette(byte *colors, uint start, uint num); virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) = 0; virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) = 0; - + bool pollEvent(Common::Event &event); - + virtual uint32 getMillis(); virtual void delayMillis(uint msecs); - + virtual void setTimerCallback(TimerProc callback, int interval); virtual MutexRef createMutex() { return NULL; } virtual void lockMutex(MutexRef mutex) {} virtual void unlockMutex(MutexRef mutex) {} virtual void deleteMutex(MutexRef mutex) {} - + int getOutputSampleRate() const { return _samplesPerSec; } virtual Audio::Mixer *getMixer(); void quit(); virtual void setWindowCaption(const char *caption) = 0; - + Common::SaveFileManager *getSavefileManager(); Common::TimerManager *getTimerManager(); }; diff --git a/backends/platform/PalmOS/Src/be_os5.cpp b/backends/platform/PalmOS/Src/be_os5.cpp index f5744d6d0e..1fc61cffbf 100644 --- a/backends/platform/PalmOS/Src/be_os5.cpp +++ b/backends/platform/PalmOS/Src/be_os5.cpp @@ -29,7 +29,7 @@ OSystem_PalmOS5::OSystem_PalmOS5() : OSystem_PalmBase() { _sound.active = false; _setPalette = false; - + _workScreenH = NULL; _overlayH = NULL; _isSwitchable = false; @@ -67,9 +67,9 @@ void OSystem_PalmOS5::calc_rect(Boolean fullscreen) { h = gVars->screenHeight * _screenHeight / _screenWidth; _screenOffset.x = 0; - _screenOffset.y = (gVars->screenHeight - h) / 2; + _screenOffset.y = (gVars->screenHeight - h) / 2; } - + _screenDest.w = w; _screenDest.h = h; } diff --git a/backends/platform/PalmOS/Src/be_os5.h b/backends/platform/PalmOS/Src/be_os5.h index c4d4560b19..99d1dd9dc1 100644 --- a/backends/platform/PalmOS/Src/be_os5.h +++ b/backends/platform/PalmOS/Src/be_os5.h @@ -115,7 +115,7 @@ private: OverlayColor *_overlayP; WinHandle _overlayH, _workScreenH; int16 *_workScreenP; - + Boolean _isSwitchable, _wasRotated; virtual void int_initBackend(); @@ -183,7 +183,7 @@ public: virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b); virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b); - + void setWindowCaption(const char *caption); }; diff --git a/backends/platform/PalmOS/Src/be_os5ex.cpp b/backends/platform/PalmOS/Src/be_os5ex.cpp index 1a5ea2bf78..05bf5e49ce 100644 --- a/backends/platform/PalmOS/Src/be_os5ex.cpp +++ b/backends/platform/PalmOS/Src/be_os5ex.cpp @@ -70,7 +70,7 @@ void OSystem_PalmOS5Ex::setTimerCallback(TimerProc callback, int timer) { } else { _timer.active = false; } - + if (!_timer.active) _timerEx.timerID = 0; } diff --git a/backends/platform/PalmOS/Src/be_zodiac.cpp b/backends/platform/PalmOS/Src/be_zodiac.cpp index 1990d3ddaa..bb78030290 100644 --- a/backends/platform/PalmOS/Src/be_zodiac.cpp +++ b/backends/platform/PalmOS/Src/be_zodiac.cpp @@ -38,7 +38,7 @@ void OSystem_PalmZodiac::int_initBackend() { _keyExtra.bitDown = keyBitRockerDown; _keyExtra.bitLeft = keyBitRockerLeft; _keyExtra.bitRight = keyBitRockerRight; - + // _keyExtra.bitActionA = keyBitActionD; // _keyExtra.bitActionB = keyBitActionB; } diff --git a/backends/platform/PalmOS/Src/be_zodiac.h b/backends/platform/PalmOS/Src/be_zodiac.h index 1adb06d049..58e2ca88ac 100644 --- a/backends/platform/PalmOS/Src/be_zodiac.h +++ b/backends/platform/PalmOS/Src/be_zodiac.h @@ -38,7 +38,7 @@ private: TwGfxSurfaceType *_palmScreenP, *_tmpScreenP; TwGfxSurfaceType *_overlayP; Boolean _fullscreen; - + TwGfxPointType _srcPos; TwGfxRectType _srcRect, _dstRect; TwGfxBitmapType _srcBmp; @@ -61,7 +61,7 @@ public: OSystem_PalmZodiac(); static OSystem *create(); - + void setFeatureState(Feature f, bool enable); int getDefaultGraphicsMode() const; diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp index e1785c9239..c30fba595c 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp @@ -36,7 +36,7 @@ AeroCDPlayer::AeroCDPlayer(OSystem *sys) { bool AeroCDPlayer::init() { aeroplayer_Startup(); _isInitialized = aeroplayer_PlayerIsActive(); - + if (_isInitialized) _volumeLimit = aeroplayer_GetMaxVolumeIndex(); @@ -73,7 +73,7 @@ void AeroCDPlayer::setVolume(int volume) { bool AeroCDPlayer::poll() { return - ( _pckLoops != 0 && + ( _pckLoops != 0 && ( getPosition() < _pckTrackEndFrame && getStatus() == AEROPLAYER_STATUS_PLAY ) @@ -107,7 +107,7 @@ void AeroCDPlayer::update() { forceStop(); else { //_pckStopTime = 0; - + if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) { setPosition(0); } else { @@ -136,10 +136,10 @@ void AeroCDPlayer::play(int track, int num_loops, int start_frame, int duration) Char fileP[100]; static const Char *ext[] = { "mp3", "ogg" }; - + // if (duration > 0) // duration += 5; - + _pckTrack = track; _pckLoops = num_loops; _pckTrackStartFrame = TO_MSECS(start_frame); @@ -149,7 +149,7 @@ void AeroCDPlayer::play(int track, int num_loops, int start_frame, int duration) aeroplayer_Pause(); aeroplayer_PlayTrack(gVars->VFS.volRefNum, fileP); aeroplayer_Pause(); - + if (_pckTrackStartFrame == 0 && _pckTrackDuration == 0) { _pckTrackDuration = getDuration(); } else { @@ -157,7 +157,7 @@ void AeroCDPlayer::play(int track, int num_loops, int start_frame, int duration) if (_pckTrackDuration == 0) _pckTrackDuration = getDuration() - _pckTrackStartFrame; } - + aeroplayer_Play(); _pckStopTime = 0; diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.h b/backends/platform/PalmOS/Src/cd_aeroplayer.h index 2f39d45a6d..e54bc1d5ff 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.h +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.h @@ -22,7 +22,7 @@ * $Id$ * */ - + #ifndef CD_AEROPLAYER_H #define CD_AEROPLAYER_H @@ -40,9 +40,9 @@ public: void update(); void play(int track, int num_loops, int start_frame, int duration); void stop(); - + void setVolume(int volume); - + private: OSystem *_sys; Char gameP[15]; diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp index 1a9752852e..5812d49b6d 100644 --- a/backends/platform/PalmOS/Src/cd_msa.cpp +++ b/backends/platform/PalmOS/Src/cd_msa.cpp @@ -49,7 +49,7 @@ bool MsaCDPlayer::init() { if (!(error = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) { // not found with audio adapter ?! - //if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) { + //if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) { if ((error = SysLibFind(sonySysLibNameMsa, &_msaRefNum))) if (error == sysErrLibNotFound) error = SysLibLoad(sonySysFileTMsaLib, sonySysFileCMsaLib, &_msaRefNum); @@ -59,11 +59,11 @@ bool MsaCDPlayer::init() { // this doesn't work the same way on build-in MP3 device and external MP3 devices if (!error) { //MsaLibClose(_msaRefNum, msaLibOpenModeAlbum); // close the lib if we previously let it open (?) Need to add Notify for sonySysNotifyMsaEnforceOpenEvent just in case ... - error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum); + error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum); //if (error == msaErrAlreadyOpen) // error = MsaLibEnforceOpen(_msaRefNum, msaLibOpenModeAlbum, appFileCreator); - + //error = (error != msaErrStillOpen) ? error : errNone; } //} @@ -156,7 +156,7 @@ void MsaCDPlayer::update() { } MsaStop(_msaRefNum, true); - + if (_msaLoops == 0) return; @@ -194,13 +194,13 @@ void MsaCDPlayer::play(int track, int num_loops, int start_frame, int duration) if (!num_loops && !start_frame) return; - + _msaTrack = track + gVars->CD.firstTrack - 1; // first track >= 1 ?, not 0 (0=album) _msaLoops = num_loops; _msaStartFrame = TO_MSECS(start_frame); _msaDuration = TO_MSECS(duration); - Err e; + Err e; MemHandle trackH; // stop current play if any @@ -215,19 +215,19 @@ void MsaCDPlayer::play(int track, int num_loops, int start_frame, int duration) MsaTime msaTime; MsaTrackInfo *trackP; UInt32 SU, fullLength; - + // FIXME (?) : this enable MsaSuToTime to return the right value in some cases MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP); MsaStop(_msaRefNum, true); - - // get the msa time - trackP = (MsaTrackInfo *)MemHandleLock(trackH); + + // get the msa time + trackP = (MsaTrackInfo *)MemHandleLock(trackH); MsaSuToTime(_msaRefNum, trackP->totalsu, &msaTime); SU = trackP->totalsu; MemPtrUnlock(trackP); MemHandleFree(trackH); - - // MSA frame in milli-seconds + + // MSA frame in milli-seconds fullLength = FROM_MIN(msaTime.minute); fullLength += FROM_SEC(msaTime.second); fullLength += msaTime.frame; @@ -240,7 +240,7 @@ void MsaCDPlayer::play(int track, int num_loops, int start_frame, int duration) } else { _msaTrackLength = fullLength; } - + // try to play the track if (start_frame == 0 && duration == 0) { MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP); @@ -250,7 +250,7 @@ void MsaCDPlayer::play(int track, int num_loops, int start_frame, int duration) _msaTrackStartSu = (UInt32) ((float)(_msaStartFrame) / ((float)fullLength / (float)SU)); _msaTrackEndSu = (UInt32) ((float)(_msaTrackLength) / ((float)fullLength / (float)SU)); _msaTrackEndSu += _msaTrackStartSu; - + if (_msaTrackEndSu > SU) _msaTrackEndSu = SU; diff --git a/backends/platform/PalmOS/Src/cd_msa.h b/backends/platform/PalmOS/Src/cd_msa.h index 8844e5b8c6..93ab279c8c 100644 --- a/backends/platform/PalmOS/Src/cd_msa.h +++ b/backends/platform/PalmOS/Src/cd_msa.h @@ -64,5 +64,5 @@ public: UInt32 _msaTrackStartSu, _msaTrackEndSu; UInt32 _msaTrackLength; }; - + #endif diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp index b647114fb8..5a9f3874eb 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp +++ b/backends/platform/PalmOS/Src/cd_pockettunes.cpp @@ -37,7 +37,7 @@ bool PckTunesCDPlayer::init() { _isInitialized = PocketTunesIsRunning(); _isPlaying = false; _pAction = NULL; - + if (_isInitialized) { _pAction = (PocketTunesAction*)MemPtrNew(sizeof(PocketTunesAction)); _volumeLimit = getVolumeLimit(); @@ -64,12 +64,12 @@ UInt32 PckTunesCDPlayer::getVolumeLimit() { _pAction->action = kPocketTunesActionGetValue; _pAction->data.getValueAction.which = kPtunesValueMaxVolume; - + EvtGetEvent(&_eAction, evtNoWait); if (PocketTunesCallSynch(_pAction) == errNone) value = _pAction->data.getValueAction.value; - return value; + return value; } UInt32 PckTunesCDPlayer::getStatus() { @@ -83,8 +83,8 @@ UInt32 PckTunesCDPlayer::getStatus() { EvtGetEvent(&_eAction, evtNoWait); if (PocketTunesCallSynch(_pAction) == errNone) status = _pAction->data.getStatusAction.status; - - return status; + + return status; } UInt32 PckTunesCDPlayer::getPosition(UInt32 deflt) { @@ -95,7 +95,7 @@ UInt32 PckTunesCDPlayer::getPosition(UInt32 deflt) { _pAction->action = kPocketTunesActionGetValue; _pAction->data.getValueAction.which = kPtunesValueSongPosition; - + EvtGetEvent(&_eAction, evtNoWait); if (PocketTunesCallSynch(_pAction) == errNone) value = _pAction->data.getValueAction.value; @@ -111,12 +111,12 @@ UInt32 PckTunesCDPlayer::getDuration() { _pAction->action = kPocketTunesActionGetValue; _pAction->data.getValueAction.which = kPtunesValueSongDuration; - + EvtGetEvent(&_eAction, evtNoWait); if (PocketTunesCallSynch(_pAction) == errNone) value = _pAction->data.getValueAction.value; - return value; + return value; } void PckTunesCDPlayer::setPosition(UInt32 value) { @@ -203,16 +203,16 @@ void PckTunesCDPlayer::play(int track, int num_loops, int start_frame, int durat EventType e; Char nameP[256], fileP[100]; static const Char *ext[] = { "mp3", "ogg" }; - + _pckTrack = track; _pckLoops = num_loops; _pckTrackStartFrame = TO_MSECS(start_frame); _pckTrackDuration = TO_MSECS(duration); VFSVolumeGetLabel(gVars->VFS.volRefNum, nameP, 256); - + StrPrintF(fileP, "/Palm/Programs/ScummVM/Audio/%s_%03ld.%s", gameP, (track + gVars->CD.firstTrack - 1), ext[gVars->CD.format]); - + if (PocketTunesOpenFile(nameP, fileP, 0) == errNone) { EvtGetEvent(&e, evtNoWait); PocketTunesPauseIfPlaying(); diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.h b/backends/platform/PalmOS/Src/cd_pockettunes.h index 4decca44a8..4a8d797158 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.h +++ b/backends/platform/PalmOS/Src/cd_pockettunes.h @@ -22,48 +22,48 @@ * $Id$ * */ - + #ifndef CD_POCKETTUNES_H #define CD_POCKETTUNES_H - + #include "cdaudio.h" #include "pockettunes.h" - + class PckTunesCDPlayer : public CDAudio { public: PckTunesCDPlayer(OSystem *sys); bool init(); void release(); - + bool poll(); void update(); void play(int track, int num_loops, int start_frame, int duration); void stop(); - + void setVolume(int volume); - + private: OSystem *_sys; Char gameP[15]; - + PocketTunesAction *_pAction; // prevent memory fragmentation EventType _eAction; - + UInt32 getStatus(); void setPosition(UInt32 value); UInt32 getDuration(); UInt32 getPosition(UInt32 deft); - - UInt32 _volumeLimit; + + UInt32 _volumeLimit; UInt32 getVolumeLimit(); - + Boolean _isPlaying; // cdrom UInt16 _pckLoops, _pckTrack; UInt32 _pckTrackStartFrame, _pckTrackEndFrame; UInt32 _pckStopTime, _pckTrackDuration; }; - + #endif - + diff --git a/backends/platform/PalmOS/Src/cdaudio.h b/backends/platform/PalmOS/Src/cdaudio.h index 2c32c669e6..7a3f5e56e4 100644 --- a/backends/platform/PalmOS/Src/cdaudio.h +++ b/backends/platform/PalmOS/Src/cdaudio.h @@ -22,7 +22,7 @@ * $Id$ * */ - + #ifndef CDAUDIO_H #define CDAUDIO_H @@ -37,7 +37,7 @@ #define FROM_SEC(secs) ((UInt32)((secs) * 1000)) class CDAudio { -public: +public: CDAudio() { _isInitialized = false; _volumeLevel = 100; @@ -45,7 +45,7 @@ public: virtual bool init() = 0; virtual void release() = 0; - + // OSystem functions virtual bool poll() = 0; virtual void play(int track, int num_loops, int start_frame, int duration) = 0; diff --git a/backends/platform/PalmOS/Src/extend.cpp b/backends/platform/PalmOS/Src/extend.cpp index 99352b8cdb..e2dbd8f093 100644 --- a/backends/platform/PalmOS/Src/extend.cpp +++ b/backends/platform/PalmOS/Src/extend.cpp @@ -43,7 +43,7 @@ void DrawStatus(Boolean show) { if (OPTIONS_TST(kOptDisableOnScrDisp)) return; - UInt8 x,y; + UInt8 x,y; UInt32 depth, d1; Boolean d2; WinScreenMode(winScreenModeGet, &d1, &d1, &depth, &d2); diff --git a/backends/platform/PalmOS/Src/init_golcd.cpp b/backends/platform/PalmOS/Src/init_golcd.cpp index 63cc98e0ab..b09d3b104e 100644 --- a/backends/platform/PalmOS/Src/init_golcd.cpp +++ b/backends/platform/PalmOS/Src/init_golcd.cpp @@ -14,7 +14,7 @@ Err GoLCDInit(MemHandle *goLcdH) { UInt16 refNum; Boolean loaded = false; *goLcdH = NULL; - + if (e = SysLibFind(goLcdLibName, &refNum)) loaded = !(e = SysLibLoad(goLcdLibType, goLcdLibCreator, &refNum)); @@ -41,7 +41,7 @@ Err GoLCDRelease(MemHandle goLcdH) { Err e; GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH); - if (lcdP->refNum != sysInvalidRefNum) + if (lcdP->refNum != sysInvalidRefNum) if (!(e = GoLcdLibClose(lcdP->refNum))) e = SysLibRemove(lcdP->refNum); @@ -115,7 +115,7 @@ Boolean GoLCDToggle(MemHandle goLcdH) { GoLCDType *lcdP = (GoLCDType *)MemHandleLock(goLcdH); active = lcdP->active; MemPtrUnlock(lcdP); - + GoLCDActivate(goLcdH, !active); return (!active); } diff --git a/backends/platform/PalmOS/Src/init_palmos.cpp b/backends/platform/PalmOS/Src/init_palmos.cpp index 7cee8f2935..3a72382362 100644 --- a/backends/platform/PalmOS/Src/init_palmos.cpp +++ b/backends/platform/PalmOS/Src/init_palmos.cpp @@ -75,7 +75,7 @@ UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh) { UInt8 mode = 0; Coord sw = 160; - Coord sh = 160; + Coord sh = 160; // Hi-Density present ? if (!FtrGet(sysFtrCreator, sysFtrNumWinVersion, &ftr)) { @@ -136,7 +136,7 @@ void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *stora UInt32 dynamicFree = 0; // Iterate through each card to support devices with multiple cards. - nCards = MemNumCards(); + nCards = MemNumCards(); for (cardNo = 0; cardNo < nCards; cardNo++) { // Iterate through the RAM heaps on a card (excludes ROM). diff --git a/backends/platform/PalmOS/Src/init_sony.cpp b/backends/platform/PalmOS/Src/init_sony.cpp index 915b3ec56f..ede7ae997a 100644 --- a/backends/platform/PalmOS/Src/init_sony.cpp +++ b/backends/platform/PalmOS/Src/init_sony.cpp @@ -121,7 +121,7 @@ UInt8 SonyScreenSize(UInt16 HRrefNum, Coord *stdw, Coord *stdh, Coord *fullw, Co UInt8 mode = 0; Coord sw = 160; - Coord sh = 160; + Coord sh = 160; Coord fw = sw; Coord fh = sh; @@ -158,6 +158,6 @@ UInt8 SonyScreenSize(UInt16 HRrefNum, Coord *stdw, Coord *stdh, Coord *fullw, Co *stdh = sh; *fullw = fw; *fullh = fh; - + return mode; } diff --git a/backends/platform/PalmOS/Src/init_stuffs.cpp b/backends/platform/PalmOS/Src/init_stuffs.cpp index 33f55ae5ce..753d2ae548 100644 --- a/backends/platform/PalmOS/Src/init_stuffs.cpp +++ b/backends/platform/PalmOS/Src/init_stuffs.cpp @@ -33,7 +33,7 @@ UInt32 StuffsGetPitch(Coord fullw) { if (OPTIONS_TST(kOptModeHiDensity)) { WinScreenGetAttribute(winScreenRowBytes, &pitch); - + // FIXME : hack for TT3 simulator (and real ?) return 28 on landscape mode if (pitch < fullw) pitch = fullw; diff --git a/backends/platform/PalmOS/Src/launcher/app.cpp b/backends/platform/PalmOS/Src/launcher/app.cpp index bcaff049ff..31c94da5b6 100644 --- a/backends/platform/PalmOS/Src/launcher/app.cpp +++ b/backends/platform/PalmOS/Src/launcher/app.cpp @@ -86,7 +86,7 @@ static Err AppStartCheckNotify() { UInt32 romVersion; Err err; - err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); + err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); if (!err) { UInt16 cardNo; LocalID dbID; @@ -128,7 +128,7 @@ static Err AppStartLoadSkin() { if (type != 'skin' || creator != appFileCreator) err = dmErrInvalidParam; } - + if (!found || err) MemSet(&(gPrefs->skin),sizeof(SkinInfoType),0); } @@ -141,13 +141,13 @@ static Err AppStartLoadSkin() { if (!err) err = DmDatabaseInfo (gPrefs->skin.cardNo, gPrefs->skin.dbID, gPrefs->skin.nameP, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } - + return err; } static Err AppStartCheckMathLib() { Err e = MathlibInit(); - + switch (e) { case errNone: break; @@ -158,7 +158,7 @@ static Err AppStartCheckMathLib() { FrmCustomAlert(FrmErrorAlert,"Can't open MathLib !",0,0); break; } - + return e; } @@ -262,7 +262,7 @@ Err AppStart(void) { gPrefs->exitLauncher = true; gPrefs->stdPalette = OPTIONS_TST(kOptDeviceOS5); gPrefs->stylusClick = true; - + } else { PrefGetAppPreferences(appFileCreator, appPrefID, gPrefs, &dataSize, true); } @@ -274,7 +274,7 @@ Err AppStart(void) { error = AppStartCheckHRmode(); if (error) return (error); - + bDirectMode = (AppStartLoadSkin() != errNone); // if volref previously defined, check if it's a valid one @@ -318,8 +318,8 @@ static Err AppStopCheckNotify() { UInt32 romVersion; Err err; - - err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); + + err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); if (!err) { UInt16 cardNo; LocalID dbID; @@ -332,7 +332,7 @@ static Err AppStopCheckNotify() SysNotifyUnregister(cardNo, dbID, sysNotifyDisplayResizedEvent, sysNotifyNormalPriority); } } - + return err; } @@ -345,7 +345,7 @@ void AppStop(void) { // Close and move Game list database GamCloseDatabase(false); - // Write the saved preferences / saved-state information. This data + // Write the saved preferences / saved-state information. This data // will saved during a HotSync backup. SavePrefs(); diff --git a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp index 7a6e35b1f9..eb4654ed10 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formCards.cpp @@ -50,7 +50,7 @@ static void CardSlotFreeList() { if (itemsText && itemsList) { cards = MemPtrRecoverHandle(itemsList); items = MemPtrRecoverHandle(itemsText); - + itemsText = NULL; itemsList = NULL; } @@ -88,13 +88,13 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { if (err || StrLen(labelP) == 0) { // if no label try to retreive card type VolumeInfoType volInfo; err = VFSVolumeInfo(volRefNum, &volInfo); - + if (!err) { ExpCardInfoType info; err = ExpCardInfo(volInfo.slotRefNum, &info); StrCopy(labelP, info.deviceClassStr); } - + if (err) // if err default name StrPrintF(labelP,"Other Card %ld", other++); } @@ -103,7 +103,7 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { cards = MemHandleNew(sizeof(CardInfoType)); else MemHandleResize(cards, MemHandleSize(cards) + sizeof(CardInfoType)); - + cardsInfo = (CardInfoType *)MemHandleLock(cards); cardsInfo[counter].volRefNum = volRefNum; StrCopy(cardsInfo[counter].nameP, labelP); @@ -146,7 +146,7 @@ static UInt16 CardSlotFillList(Boolean getRefNum = false) { // no card found ? free old list in any or return invalid volref } else { if (!getRefNum) - CardSlotFreeList(); + CardSlotFreeList(); else return vfsInvalidVolRef; } @@ -240,7 +240,7 @@ static UInt16 ConfigTabSave() { CardSlotCreateDirs(); CardSlotFreeList(); - + return updateCode; } @@ -341,7 +341,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) { case CardSlotCancelButton: CardSlotFormCancel(); break; - + case TabCardGameListMoveCheckbox: GameListTabDraw(); break; @@ -352,7 +352,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp index ceb4886dcf..0540c12577 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formEditGame.cpp @@ -66,7 +66,7 @@ static void GameTabInit(GameInfoType *gameInfoP) { nameP = (Char *)MemHandleLock(nameH); pathP = (Char *)MemHandleLock(pathH); gameP = (Char *)MemHandleLock(gameH); - + if (gameInfoP) { LstSetSelection(list1P, gameInfoP->engine); LstSetTopItem(list1P, gameInfoP->engine); @@ -139,7 +139,7 @@ static Err GameTabSave(GameInfoType *gameInfoP) { MemPtrFree(itemsText); itemsText = NULL; } - + return errNone; } @@ -148,7 +148,7 @@ static void DisplayInit(GameInfoType *gameInfoP) { list1P = (ListType *)GetObjectPtr(TabGameDisplayGfxListList); list2P = (ListType *)GetObjectPtr(TabGameDisplayRenderList); - + if (gameInfoP) { LstSetSelection(list1P, gameInfoP->gfxMode); LstSetSelection(list2P, gameInfoP->renderMode); @@ -169,7 +169,7 @@ static void DisplayInit(GameInfoType *gameInfoP) { static Err DisplaySave(GameInfoType *gameInfoP) { ListType *list1P, *list2P; - ControlType *cck6P, *cck7P, *cck8P; + ControlType *cck6P, *cck7P, *cck8P; FormType *frmP = FrmGetActiveForm(); @@ -187,7 +187,7 @@ static Err DisplaySave(GameInfoType *gameInfoP) { gameInfoP->fullscreen = CtlGetValue(cck7P); gameInfoP->aspectRatio = CtlGetValue(cck8P); } - + return errNone; } @@ -257,7 +257,7 @@ static void OptionsInit(GameInfoType *gameInfoP) { static Err OptionsSave(GameInfoType *gameInfoP) { FieldType *fld4P, *fld5P, *fld6P; - ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P; + ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P; ListType *list2P, *list3P; FormType *frmP = FrmGetActiveForm(); @@ -291,7 +291,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) { } else { gameInfoP->language = LstGetSelection(list2P); gameInfoP->platform = LstGetSelection(list3P); - + gameInfoP->autoLoad = CtlGetValue(cck1P); gameInfoP->bootParam = CtlGetValue(cck2P); gameInfoP->setPlatform = CtlGetValue(cck3P); @@ -302,7 +302,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) { gameInfoP->bootValue = StrAToI(FldGetTextPtr(fld5P)); gameInfoP->talkValue = StrAToI(FldGetTextPtr(fld6P)); } - + return errNone; } @@ -371,7 +371,7 @@ static void GameManSave(UInt16 index) { newGameInfo.version = curItemVersion; newGameInfo.icnID = 0xFFFF; newGameInfo.selected = true; - + // default sound data newGameInfo.musicInfo.volume.palm = 50; newGameInfo.musicInfo.volume.music = 192; @@ -383,7 +383,7 @@ static void GameManSave(UInt16 index) { newGameInfo.musicInfo.sound.defaultTrackLength = 10; newGameInfo.musicInfo.sound.firstTrack = 1; } - + GameTabSave(&newGameInfo); DisplaySave(&newGameInfo); OptionsSave(&newGameInfo); @@ -397,14 +397,14 @@ static void GameManSave(UInt16 index) { { RectangleType rArea; UInt16 posIndex, maxView; - + // get the sorted index index = GamGetSelected(); // if new item is out of the list bounds, change current list pos SknGetListBounds(&rArea, NULL); maxView = rArea.extent.y / sknInfoListItemSize; posIndex = gPrefs->listPosition; - + // if out of the current list position if (!(index >= posIndex && index < (posIndex + maxView))) gPrefs->listPosition = index; // this value is corrected in SknUpdateList if needed @@ -421,7 +421,7 @@ static void GameManSave(UInt16 index) { * FUNCTION: EditGameFormInit * FUNCTION: EditGameFormHandleEvent * - * DESCRIPTION: + * DESCRIPTION: * * REVISION HISTORY: * @@ -468,14 +468,14 @@ static void EditGameBowser() { UInt16 volRefNum = gPrefs->card.volRefNum; Char *textP, *pathP = (Char *)MemPtrNew(kFileBrowserLibPathBufferSize); pathP[0] = chrNull; - + if (FileBrowserLibShowOpenDialog(refNum, &volRefNum, pathP, 0, 0, 0, "Game Data Path", kFileBrowserLibFlagNoFiles)) { FieldPtr fldP; MemHandle textH; Int16 offset, copySize, maxSize; - + fldP = (FieldType *)GetObjectPtr(TabGameInfoPathField); - maxSize = FldGetMaxChars(fldP); + maxSize = FldGetMaxChars(fldP); textH = FldGetTextHandle(fldP); FldSetTextHandle(fldP, NULL); @@ -518,7 +518,7 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { EditGameCancel(); handled = true; break; - + case frmOpenEvent: switch (gFormEditMode) { case edtModeAdd: @@ -567,11 +567,11 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { case GameEditCancelButton: EditGameCancel(); break; - + case GameEditDeleteButton: EditGameFormDelete(false); break; - + case TabGameInfoBrowsePushButton: EditGameBowser(); break; @@ -607,6 +607,6 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp index 509adfa735..35b44486e9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formMisc.cpp @@ -40,7 +40,7 @@ static Boolean ScummVMTabSave() { fld1P = (FieldType *)GetObjectPtr(TabMiscScummVMDebugLevelField); fld2P = (FieldType *)GetObjectPtr(TabMiscScummVMAutosaveField); - + cckP[0] = (ControlType *)GetObjectPtr(TabMiscScummVMAutosaveCheckbox); cckP[3] = (ControlType *)GetObjectPtr(TabMiscScummVMDebugCheckbox); cckP[6] = (ControlType *)GetObjectPtr(TabMiscScummVMDemoCheckbox); @@ -69,7 +69,7 @@ static Boolean ScummVMTabSave() { gPrefs->debugLevel = StrAToI(FldGetTextPtr(fld1P)); gPrefs->autoSavePeriod = StrAToI(FldGetTextPtr(fld2P)); - + return true; } @@ -111,7 +111,7 @@ static void ExtsTabSave() { gPrefs->lightspeed.enable = CtlGetValue(cckP[0]); gPrefs->lightspeed.mode = LstGetSelection(list1P); } - if (OPTIONS_TST(kOptGoLcdAPI)) { + if (OPTIONS_TST(kOptGoLcdAPI)) { cckP[1] = (ControlType *)GetObjectPtr(TabMiscExtsGolcdCheckbox); gPrefs->goLCD = CtlGetValue(cckP[1]); } @@ -176,7 +176,7 @@ static void MiscFormSave() { if (!ScummVMTabSave()) return; PalmOSTabSave(); ExtsTabSave(); - + TabDeleteTabs(myTabP); FrmReturnToMain(); } @@ -216,7 +216,7 @@ static void MiscFormInit() { TabMoveUpObject(frmP, TabMiscExtsNothingLabel, 12); extsCnt--; } - + if (extsCnt) FrmRemoveObject(&frmP, FrmGetObjectIndex(frmP, TabMiscExtsNothingLabel)); @@ -270,6 +270,6 @@ Boolean MiscFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp index 641d646bb2..bb0ac894c2 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formSelect.cpp @@ -197,10 +197,10 @@ static void SelectorFormInit() { listP = (ListType *)FrmGetObjectPtr(frmP, FrmGetObjectIndex(frmP, EngineListList)); itemsText = (Char **)MemPtrNew(ENGINE_COUNT * sizeof(Char *)); - + for (int i = 0; i < ENGINE_COUNT; i++) itemsText[i] = (Char *)engines[i].nameP; - + LstSetListChoices (listP, itemsText, ENGINE_COUNT); LstSetSelection(listP, 0); @@ -251,7 +251,7 @@ Boolean SelectorFormHandleEvent(EventPtr eventP) { case lstSelectEvent: if (eventP->data.lstSelect.listID == EngineSupportedList) LstSetSelection(eventP->data.lstSelect.pList, -1); - else + else SelectorSetList(eventP->data.lstSelect.selection); handled = true; break; @@ -273,6 +273,6 @@ Boolean SelectorFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp b/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp index 74622d8f14..3f4ab1b28f 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/forminfo.cpp @@ -43,10 +43,10 @@ static void SystemTabDraw() { PalmGetMemory(&sm, &dm, &sf, 0); stack = GetStackSize(); df = gVars->startupMemory; - + WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground)); FntSetFont(stdFont); - + StrIToA(num, dm); x = 147 - FntCharsWidth(num, StrLen(num)) + 5; WinDrawChars(num, StrLen(num), x, 12 + 30); @@ -115,7 +115,7 @@ Boolean InfoFormHandleEvent(EventPtr eventP) { InfoFormInit(); handled = true; break; - + case frmCloseEvent: InfoFormSave(); handled = true; @@ -141,6 +141,6 @@ Boolean InfoFormHandleEvent(EventPtr eventP) { default: break; } - + return handled; } diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 6a5520eb55..9970e608c9 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -48,7 +48,7 @@ static Err BeamMe() { err = SendDatabase(0, dbID, "ScummVM.prc", "\nPlay your favorite LucasArts games"); else err = DmGetLastErr(); - + return err; } @@ -107,7 +107,7 @@ static Boolean MainFormDoCommand(UInt16 command) FrmPopupForm(GameEditForm); handled = true; break; - + case MainGamesDelete: EditGameFormDelete(true); handled = true; diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp index 8413216bb1..58eaa5b5fc 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp @@ -256,7 +256,7 @@ static void MusicFormInit(UInt16 index) { recordH = DmQueryRecord(gameDB, index); ogameInfoP = (GameInfoType *)MemHandleLock(recordH); - + if (!ogameInfoP) { FrmCustomAlert(FrmErrorAlert, "An error occured.",0,0); return; diff --git a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp b/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp index 0dd3427c1a..d3f18e39d7 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formtabs.cpp @@ -26,7 +26,7 @@ void TabDeleteTabs(TabType *tabP) { UInt16 cnt, num; num = MemPtrSize(tabP->tabs) / sizeof(TabDataType); - for (cnt = 0; cnt < num; cnt++) + for (cnt = 0; cnt < num; cnt++) FrmDeleteForm(tabP->tabs[cnt].srcP); delete tabP->tabs; @@ -93,7 +93,7 @@ Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscI UInt16 items = LstGetNumberOfItems((ListType *)objP); UInt16 trigger = id - 1; trigger = (FrmGetObjectIndex((FormType *)*dstP, trigger) != frmInvalidObjectId) ? trigger : 0; - + LstNewList(dstP, id, x, y, w, h, font, visible, trigger); newP = (ListType *)FrmGetObjectPtr((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id)); LstSetListChoices(newP, itemsP, items); @@ -197,10 +197,10 @@ void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) { r.topLeft.y -= 1; WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame)); - WinDrawRectangleFrame(simpleFrame, &r); + WinDrawRectangleFrame(simpleFrame, &r); WinSetForeColor(line); WinDrawLine(r.topLeft.x, r.topLeft.y, r.topLeft.x + r.extent.x - 1, r.topLeft.y); - FrmShowObject(frmP, idx); + FrmShowObject(frmP, idx); } else { UInt8 frame = UIColorGetTableEntryIndex(UIObjectFrame); @@ -211,7 +211,7 @@ void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) { light.b = (255 - light.b) > 72 ? light.b + 72 : 255; WinSetForeColor(WinRGBToIndex(&light)); - WinDrawRectangleFrame(simpleFrame, &r); + WinDrawRectangleFrame(simpleFrame, &r); WinSetForeColor(frame); WinDrawLine(r.topLeft.x - 1, r.topLeft.y + r.extent.y, r.topLeft.x + r.extent.x, r.topLeft.y + r.extent.y); } diff --git a/backends/platform/PalmOS/Src/launcher/games.cpp b/backends/platform/PalmOS/Src/launcher/games.cpp index 2300a36f09..b223897fd5 100644 --- a/backends/platform/PalmOS/Src/launcher/games.cpp +++ b/backends/platform/PalmOS/Src/launcher/games.cpp @@ -94,7 +94,7 @@ static Err GamUpdateList() { // new format gitCur.version = curItemVersion; - + if (version < itemVersion_300) { gitCur.musicInfo.volume.palm = 50; gitCur.musicInfo.volume.music = 192; @@ -109,7 +109,7 @@ static Err GamUpdateList() { if (version < itemVersion_310) gitCur.engine = 0; - + if (version < itemVersion_320) gitCur.renderMode = 0; @@ -159,34 +159,34 @@ static Err GamUpdateList() { if (version <= itemVersion_340) { gitCur.platform++; - + if (gitCur.language == 3) gitCur.language = 0; else if (gitCur.language >= 11) gitCur.language++; } - + if (version <= itemVersion_350) if (gitCur.platform >= 9) gitCur.platform++; - + if (version <= itemVersion_351) { if (gitCur.engine >= ENGINE_LURE) // newly added engine gitCur.engine++; - + if (gitCur.engine == ENGINE_SCUMM) // reorder gitCur.engine = ENGINE_AGOS; else if (gitCur.engine == ENGINE_AGOS) gitCur.engine = ENGINE_SCUMM; } - + if (version <= itemVersion_352) { if (gitCur.engine >= ENGINE_CINE) // newly added engine gitCur.engine++; - + gitCur.platform++; } - + if (version <= itemVersion_353) gitCur.musicInfo.sound.drvMusic++; @@ -288,16 +288,16 @@ static Err GamUpdateList() { // to V3.5 gitCur.platform++; - + if (gitCur.language == 3) gitCur.language = 0; else if (gitCur.language >= 11) gitCur.language++; - + // to V3.5.1 if (gitCur.platform >= 9) gitCur.platform++; - + //to V3.5.3 gitCur.musicInfo.sound.drvMusic++; @@ -366,7 +366,7 @@ static Err GamUpdateList() { FrmDeleteForm(frmP); if (ofmP) FrmSetActiveForm(ofmP); - } + } } } @@ -529,7 +529,7 @@ Boolean GamJumpTo(Char letter) { GamUnselect(); DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean)); - + if (index < gPrefs->listPosition || index >= (gPrefs->listPosition + maxView)) gPrefs->listPosition = index; } diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp index 4dc1011a15..cb2d52b20e 100644 --- a/backends/platform/PalmOS/Src/launcher/launch.cpp +++ b/backends/platform/PalmOS/Src/launcher/launch.cpp @@ -95,7 +95,7 @@ UInt16 ModFind(const Char *f) { if (!e) e = VFSFileClose(r); if (!e) break; } - + return volRefNum; } @@ -105,7 +105,7 @@ static void ModSetStack(UInt32 newSize, UInt16 cardNo, LocalID dbID) { if (dbRef) { MemHandle pref = DmGetResource('pref',0); UInt32 size = 0; - + if (pref) { SysAppPrefsType *data = (SysAppPrefsType *)MemHandleLock(pref); size = data->stackSize; @@ -273,7 +273,7 @@ Boolean StartScummVM(Int16 engine) { case 5: ArgsAdd(&argvP[argc], "--render-mode=", "hercGreen", &argc); break; - } + } switch (gameInfoP->gfxMode) { case 1: @@ -311,7 +311,7 @@ Boolean StartScummVM(Int16 engine) { "segacd", "windows" }; - ArgsAdd(&argvP[argc], "--platform=", platform[gameInfoP->platform], &argc); + ArgsAdd(&argvP[argc], "--platform=", platform[gameInfoP->platform], &argc); } // subtitles @@ -354,7 +354,7 @@ Boolean StartScummVM(Int16 engine) { else ArgsAdd(&argvP[argc], "-e", "auto", &argc); // no driver, switch to auto } else { - ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc); + ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc); } // output rate @@ -398,7 +398,7 @@ Boolean StartScummVM(Int16 engine) { if (gPrefs->altIntro) ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc); } - + if (engine == ENGINE_SCUMM) { // demo mode ? if (gPrefs->demoMode) @@ -418,7 +418,7 @@ Boolean StartScummVM(Int16 engine) { lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255); toLauncher= (gPrefs->exitLauncher); - // gVars values + // gVars values // (gVars->HRrefNum defined in checkHRmode on Clie) #ifndef _DEBUG_ENGINE gVars->VFS.volRefNum = (gPrefs->card.autoDetect ? vfsInvalidVolRef : gPrefs->card.volRefNum); @@ -436,12 +436,12 @@ Boolean StartScummVM(Int16 engine) { // user params HWR_RSTALL(); - + if (gPrefs->goLCD) HWR_SET(INIT_GOLCD); else OPTIONS_RST(kOptGoLcdAPI); - + if (!gPrefs->autoOff) HWR_SET(INIT_AUTOOFF); diff --git a/backends/platform/PalmOS/Src/launcher/skin.cpp b/backends/platform/PalmOS/Src/launcher/skin.cpp index ae042bcb39..3e8b0f0b96 100644 --- a/backends/platform/PalmOS/Src/launcher/skin.cpp +++ b/backends/platform/PalmOS/Src/launcher/skin.cpp @@ -232,7 +232,7 @@ void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP) { rP->topLeft.x = strTemp[sknInfoPosX] * 2; rP->topLeft.y = strTemp[sknInfoPosY] * 2; - MemPtrUnlock(strTemp); + MemPtrUnlock(strTemp); DmReleaseResource(hStr); } @@ -274,8 +274,8 @@ UInt8 SknSetState(DmOpenRef skinDBP, DmResID resID, UInt8 newState) { DmWrite(strTemp, 0, &newState, 1); } - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -298,8 +298,8 @@ UInt8 SknGetDepth(DmOpenRef skinDBP) { if (hStr) { strTemp = (UInt8 *)MemHandleLock(hStr); depth = *strTemp; - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -321,9 +321,9 @@ UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID) { if (hStr) { strTemp = (UInt8 *)MemHandleLock(hStr); - oldState = strTemp[sknInfoState]; - MemPtrUnlock(strTemp); - DmReleaseResource(hStr); + oldState = strTemp[sknInfoState]; + MemPtrUnlock(strTemp); + DmReleaseResource(hStr); } } } @@ -450,7 +450,7 @@ void SknUpdateList() { x = rCopy.topLeft.x; y = rCopy.topLeft.y; rCopy.topLeft.x -= rField.topLeft.x; - rCopy.topLeft.y -= rField.topLeft.y; + rCopy.topLeft.y -= rField.topLeft.y; SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y); // copy bottom bg SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &rField); @@ -458,7 +458,7 @@ void SknUpdateList() { x = rCopy.topLeft.x; y = rCopy.topLeft.y; rCopy.topLeft.x -= rField.topLeft.x; - rCopy.topLeft.y -= rField.topLeft.y; + rCopy.topLeft.y -= rField.topLeft.y; SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y); FntSetFont(stdFont); diff --git a/backends/platform/PalmOS/Src/launcher/start.cpp b/backends/platform/PalmOS/Src/launcher/start.cpp index f492655cf8..b5e8f24884 100644 --- a/backends/platform/PalmOS/Src/launcher/start.cpp +++ b/backends/platform/PalmOS/Src/launcher/start.cpp @@ -97,9 +97,9 @@ Err SendDatabase (UInt16 cardNo, LocalID dbID, Char *nameP, Char *descriptionP) * minimum requirement. * * PARAMETERS: requiredVersion - minimum rom version required - * (see sysFtrNumROMVersion in SystemMgr.h + * (see sysFtrNumROMVersion in SystemMgr.h * for format) - * launchFlags - flags that indicate if the application + * launchFlags - flags that indicate if the application * UI is initialized. * * RETURNED: error code or zero if rom is compatible @@ -119,7 +119,7 @@ static Err RomVersionCompatible(UInt32 requiredVersion, UInt16 launchFlags) { FrmAlert (RomIncompatibleAlert); - // Palm OS 1.0 will continuously relaunch this app unless we switch to + // Palm OS 1.0 will continuously relaunch this app unless we switch to // another safe one. if (romVersion <= kPalmOS10Version) AppLaunchWithCommand(sysFileCDefaultApp, sysAppLaunchCmdNormalLaunch, NULL); @@ -210,7 +210,7 @@ static Boolean AppHandleEvent(EventPtr eventP) { } return true; } - + return false; } @@ -218,7 +218,7 @@ static Boolean AppHandleEvent(EventPtr eventP) { * * FUNCTION: AppEventLoop * - * DESCRIPTION: This routine is the event loop for the application. + * DESCRIPTION: This routine is the event loop for the application. * * PARAMETERS: nothing * @@ -249,8 +249,8 @@ static void AppEventLoop(void) { * * DESCRIPTION: This is the main entry point for the application. * - * PARAMETERS: cmd - word value specifying the launch code. - * cmdPB - pointer to a structure that is associated with the launch code. + * PARAMETERS: cmd - word value specifying the launch code. + * cmdPB - pointer to a structure that is associated with the launch code. * launchFlags - word value providing extra information about the launch. * * RETURNED: Result of launch @@ -324,7 +324,7 @@ static UInt32 ScummVMPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) { case sysAppLaunchCmdNormalLaunch: error = AppStart(); - if (error) + if (error) goto end; if (!bDirectMode) { @@ -352,8 +352,8 @@ end: * * DESCRIPTION: This is the main entry point for the application. * - * PARAMETERS: cmd - word value specifying the launch code. - * cmdPB - pointer to a structure that is associated with the launch code. + * PARAMETERS: cmd - word value specifying the launch code. + * cmdPB - pointer to a structure that is associated with the launch code. * launchFlags - word value providing extra information about the launch. * RETURNED: Result of launch * diff --git a/backends/platform/PalmOS/Src/launcher/start.h b/backends/platform/PalmOS/Src/launcher/start.h index bccbc53f86..3ed52b465b 100644 --- a/backends/platform/PalmOS/Src/launcher/start.h +++ b/backends/platform/PalmOS/Src/launcher/start.h @@ -22,7 +22,7 @@ * $Id$ * */ - + #ifndef __START_H__ #define __START_H__ @@ -36,7 +36,7 @@ typedef struct { //skin params SkinInfoType skin; // card where is located the skin - Boolean soundClick; + Boolean soundClick; Boolean vibrator; Boolean autoOff; diff --git a/backends/platform/PalmOS/Src/modules.cpp b/backends/platform/PalmOS/Src/modules.cpp index bfe2595b07..f66d7d6ae6 100644 --- a/backends/platform/PalmOS/Src/modules.cpp +++ b/backends/platform/PalmOS/Src/modules.cpp @@ -105,7 +105,7 @@ static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) LocalID dbID; LaunchParamType *lp = (LaunchParamType *)cmdPBP; - + gVars = lp->gVars; argvP = lp->args.argv; @@ -128,7 +128,7 @@ static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) // MemPtrSetOwner(gVars, ownerID); // ArgsSetOwner(argvP, ownerID); // will be freed by main(...) // MemPtrFree(lp); // will be freed by the system on exit - + run(lp->args.argc, argvP); cardNo = 0; diff --git a/backends/platform/PalmOS/Src/native/pace.h b/backends/platform/PalmOS/Src/native/pace.h index dac855c3ba..b3e2d14593 100644 --- a/backends/platform/PalmOS/Src/native/pace.h +++ b/backends/platform/PalmOS/Src/native/pace.h @@ -52,9 +52,9 @@ extern GlobalsType global; #ifdef __cplusplus -# define PACE_CLASS_WRAPPER(rv) extern "C" rv +# define PACE_CLASS_WRAPPER(rv) extern "C" rv #else -# define PACE_CLASS_WRAPPER(rv) rv +# define PACE_CLASS_WRAPPER(rv) rv #endif #define PACE_CALLBACK_PTR g_call68KFuncP #define PACE_EMULSTATE g_emulStateP @@ -66,7 +66,7 @@ extern GlobalsType global; #define PACE_PARAMS_INIT() \ UInt8 params[] = { - + #define PACE_PARAMS_ADD8(param) \ (UInt8)(param), \ 0, @@ -91,7 +91,7 @@ extern GlobalsType global; static_cast<void *>(PACE_EMULSTATE), \ PceNativeTrapNo(sysTrapPinsDispatch), \ NULL, 0))); - + #define PACE_PIN_EXEC(pinTrap, returnType) \ PACE_EMULSTATE->regData[2] = pinTrap; \ return ((returnType)((PACE_CALLBACK_PTR)( \ @@ -100,4 +100,4 @@ extern GlobalsType global; ¶ms, \ sizeof(params)))); -#endif
\ No newline at end of file +#endif diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp index 87de372943..7323bb6d69 100644 --- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp +++ b/backends/platform/PalmOS/Src/native/zodiacARM.cpp @@ -74,11 +74,11 @@ static void Go() { int argc; #ifdef DEBUG_ARM -// Tell the debugger we want to enable full debugging - UInt32 flags = AdnDebugEnableGet(); - flags |= kAdnEnableMasterSwitch | kAdnEnableFullDebugging; - AdnDebugEnableSet(flags); -// Tell the debugger where our code lives in memory: +// Tell the debugger we want to enable full debugging + UInt32 flags = AdnDebugEnableGet(); + flags |= kAdnEnableMasterSwitch | kAdnEnableFullDebugging; + AdnDebugEnableSet(flags); +// Tell the debugger where our code lives in memory: AdnDebugNativeRegister(sysFileTApplication, appFileCreator, 'ARMC', 1); #endif @@ -102,9 +102,9 @@ static void Go() { if (HWR_INIT(INIT_VIBRATOR)) gVars->vibrator = RumbleInit(); // run ... - DO_EXIT ( palm_main(argc, argvP); ) + DO_EXIT ( palm_main(argc, argvP); ) - // release + // release if (HWR_INIT(INIT_VIBRATOR)) RumbleRelease(); stdio_release(); @@ -118,7 +118,7 @@ static void Go() { Int8 *g_newStack, *g_newStackPos; void *g_oldStack; -static asm void *StkSwap(void *newStack ,void *dummy) { +static asm void *StkSwap(void *newStack ,void *dummy) { mov r1, r13 mov r13, r0 mov r0, r1 @@ -134,7 +134,7 @@ extern UInt32 PilotMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) { g_newStack = (Int8 *)malloc(g_stackSize + 8); g_newStackPos = (g_newStack + g_stackSize); g_newStackPos -= ((UInt32)g_newStackPos & 7); - + g_oldStack = StkSwap(g_newStackPos, 0); Go(); diff --git a/backends/platform/PalmOS/Src/os5_gfx.cpp b/backends/platform/PalmOS/Src/os5_gfx.cpp index 16ca267389..2d26419dff 100644 --- a/backends/platform/PalmOS/Src/os5_gfx.cpp +++ b/backends/platform/PalmOS/Src/os5_gfx.cpp @@ -40,7 +40,7 @@ WinHandle OSystem_PalmOS5::alloc_screen(Coord w, Coord h) { UInt16 old = WinSetCoordinateSystem(kCoordinatesNative); winH = WinCreateOffscreenWindow(w, h, nativeFormat, &e); WinSetCoordinateSystem(old); - + return winH; } @@ -162,9 +162,9 @@ void OSystem_PalmOS5::hotswap_gfx_mode(int mode) { void OSystem_PalmOS5::unload_gfx_mode() { if (!_gfxLoaded) - return; + return; _gfxLoaded = false; - + // mouse data freed in quit() free(_offScreenP); @@ -172,7 +172,7 @@ void OSystem_PalmOS5::unload_gfx_mode() { WinDeleteWindow(_workScreenH, false); if (_overlayH) WinDeleteWindow(_overlayH, false); - + _workScreenH = NULL; _overlayH = NULL; diff --git a/backends/platform/PalmOS/Src/os5_mouse.cpp b/backends/platform/PalmOS/Src/os5_mouse.cpp index 3b2c7840e6..0be9d3da46 100644 --- a/backends/platform/PalmOS/Src/os5_mouse.cpp +++ b/backends/platform/PalmOS/Src/os5_mouse.cpp @@ -30,7 +30,7 @@ void OSystem_PalmOS5::setCursorPalette(const byte *colors, uint start, uint num) _mousePal[i + start] = gfxMakeDisplayRGB(colors[0], colors[1], colors[2]); colors += 4; } - + _cursorPaletteDisabled = false; } @@ -42,7 +42,7 @@ void OSystem_PalmOS5::disableCursorPalette(bool disable) { void OSystem_PalmOS5::draw_mouse() { if (!_mouseDataP || _mouseDrawn || !_mouseVisible) return; - + byte *src = _mouseDataP; int x = _mouseCurState.x - _mouseHotspotX; @@ -145,7 +145,7 @@ void OSystem_PalmOS5::undraw_mouse() { } else { byte *dst = _offScreenP + _mouseOldState.y * _screenWidth + _mouseOldState.x; byte *bak = _mouseBackupP; - + do { MemMove(dst, bak, _mouseOldState.w); dst += _screenWidth; @@ -154,4 +154,4 @@ void OSystem_PalmOS5::undraw_mouse() { } _mouseDrawn = false; -}
\ No newline at end of file +} diff --git a/backends/platform/PalmOS/Src/os5_sound.cpp b/backends/platform/PalmOS/Src/os5_sound.cpp index 92147ef2a0..608b8af543 100644 --- a/backends/platform/PalmOS/Src/os5_sound.cpp +++ b/backends/platform/PalmOS/Src/os5_sound.cpp @@ -42,7 +42,7 @@ SoundExType _soundEx; static Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) { SoundExType *_soundEx = (SoundExType *)UserDataP; SoundType *_sound = _soundEx->sound; - + if (_soundEx->set && _soundEx->size) { MemMove(bufferP, _soundEx->dataP, _soundEx->size); *bufferSizeP = _soundEx->size; @@ -53,7 +53,7 @@ static Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt MemSet(bufferP, 128, 0); *bufferSizeP = 128; } - + return errNone; } diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h index bb48761fcf..40485a5927 100644 --- a/backends/platform/PalmOS/Src/prefixes/compile.h +++ b/backends/platform/PalmOS/Src/prefixes/compile.h @@ -38,7 +38,7 @@ #define DISABLE_SAGA #define DISABLE_KYRA #define DISABLE_AWE -#define DISABLE_GOB +#define DISABLE_GOB #define DISABLE_LURE #define DISABLE_CINE #define DISABLE_AGI diff --git a/backends/platform/PalmOS/Src/zodiac_event.cpp b/backends/platform/PalmOS/Src/zodiac_event.cpp index 62abf8019d..f629c4cbd6 100644 --- a/backends/platform/PalmOS/Src/zodiac_event.cpp +++ b/backends/platform/PalmOS/Src/zodiac_event.cpp @@ -86,7 +86,7 @@ bool OSystem_PalmZodiac::check_event(Common::Event &event, EventPtr ev) { if (_sound.active) SndStreamPause(_soundEx.handle, true); break; - + case vchrLateWakeup: // resume the sound thread if any if (_sound.active) diff --git a/backends/platform/PalmOS/Src/zodiac_gfx.cpp b/backends/platform/PalmOS/Src/zodiac_gfx.cpp index 0c70aa9fe4..e7f7adb773 100644 --- a/backends/platform/PalmOS/Src/zodiac_gfx.cpp +++ b/backends/platform/PalmOS/Src/zodiac_gfx.cpp @@ -175,7 +175,7 @@ void OSystem_PalmZodiac::unload_gfx_mode() { Err e; if (!_gfxLoaded) - return; + return; _gfxLoaded = false; if (_tmpScreenP) { @@ -186,7 +186,7 @@ void OSystem_PalmZodiac::unload_gfx_mode() { e = TwGfxFreeSurface(_overlayP); e = TwGfxClose(_gfxH); - UInt32 depth = 8; + UInt32 depth = 8; WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL); clearScreen(); @@ -246,11 +246,11 @@ void OSystem_PalmZodiac::updateScreen() { } e = TwGfxDrawBitmap(_tmpScreenP, &pos, &_srcBmp); e = TwGfxWaitForVBlank(_gfxH); - e = TwGfxStretchBlt2(_palmScreenP, &dst, _tmpScreenP, &_srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0)); - + e = TwGfxStretchBlt2(_palmScreenP, &dst, _tmpScreenP, &_srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0)); + } else { TwGfxPointType pos = {_srcPos.x, _srcPos.y}; - + if (_new_shake_pos != _current_shake_pos) { if (_new_shake_pos != 0) { TwGfxRectType r = { _screenOffset.x, _screenOffset.y, _screenWidth, _new_shake_pos }; @@ -263,7 +263,7 @@ void OSystem_PalmZodiac::updateScreen() { e = TwGfxDrawBitmap(_palmScreenP, &pos, &_srcBmp); } } - + // undraw the mouse undraw_mouse(); } diff --git a/backends/platform/PalmOS/Src/zodiac_mouse.cpp b/backends/platform/PalmOS/Src/zodiac_mouse.cpp index 80acdae5ea..6fa19d090b 100644 --- a/backends/platform/PalmOS/Src/zodiac_mouse.cpp +++ b/backends/platform/PalmOS/Src/zodiac_mouse.cpp @@ -28,7 +28,7 @@ void OSystem_PalmZodiac::draw_mouse() { if (!_mouseDataP || _mouseDrawn || !_mouseVisible) return; - + byte *src = _mouseDataP; int x = _mouseCurState.x - _mouseHotspotX; diff --git a/backends/platform/PalmOS/Src/zodiac_overlay.cpp b/backends/platform/PalmOS/Src/zodiac_overlay.cpp index 33e5da2ac4..34390853fc 100644 --- a/backends/platform/PalmOS/Src/zodiac_overlay.cpp +++ b/backends/platform/PalmOS/Src/zodiac_overlay.cpp @@ -43,7 +43,7 @@ void OSystem_PalmZodiac::clearOverlay() { void OSystem_PalmZodiac::grabOverlay(OverlayColor *buf, int pitch) { Err e; OverlayColor *src; - + e = TwGfxLockSurface(_overlayP, (void **)&src); int h = _screenHeight; do { |