diff options
author | Chris Apers | 2004-12-20 17:10:53 +0000 |
---|---|---|
committer | Chris Apers | 2004-12-20 17:10:53 +0000 |
commit | effc4430b3d4e1a2a1c04eb363f1d5b783489c48 (patch) | |
tree | 00be716ea81e8776fd0f41ca8c633505ea918203 /backends/PalmOS/Src | |
parent | 486082cce4fbee64f23df351fa40adcc348608b9 (diff) | |
download | scummvm-rg350-effc4430b3d4e1a2a1c04eb363f1d5b783489c48.tar.gz scummvm-rg350-effc4430b3d4e1a2a1c04eb363f1d5b783489c48.tar.bz2 scummvm-rg350-effc4430b3d4e1a2a1c04eb363f1d5b783489c48.zip |
Prevent conflict with the new OSystem enum
svn-id: r16169
Diffstat (limited to 'backends/PalmOS/Src')
-rw-r--r-- | backends/PalmOS/Src/palm.cpp | 10 | ||||
-rw-r--r-- | backends/PalmOS/Src/palmevt.cpp | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index 831aedcef8..b7cecb341f 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -82,7 +82,7 @@ void OSystem_PALMOS::battery_handler() { } if (voltage <= criticalThreshold) { - EventType event; + ::EventType event; event.eType = keyDownEvent; event.data.keyDown.chr = vchrAutoOff; event.data.keyDown.modifiers = commandKeyMask; @@ -187,7 +187,7 @@ void OSystem_PALMOS::setFeatureState(Feature f, bool enable) { case kFeatureAspectRatioCorrection: if (_mode == GFX_WIDE && OPTIONS_TST(kOptDeviceZodiac)) { _adjustAspectRatio ^= true; - ClearScreen(); + clearScreen(); } break; } @@ -300,9 +300,3 @@ OSystem_PALMOS::OSystem_PALMOS() { memset(&_sound,0,sizeof(SoundDataType)); } -void ClearScreen() { - RGBColorType rgb = {0, 0,0,0}; - RectangleType r = {0, 0, gVars->screenFullWidth, gVars->screenFullHeight}; - WinSetForeColor(WinRGBToIndex(&rgb)); - WinDrawRectangle(&r,0); -} diff --git a/backends/PalmOS/Src/palmevt.cpp b/backends/PalmOS/Src/palmevt.cpp index 1fcbf123aa..cbdc0465c1 100644 --- a/backends/PalmOS/Src/palmevt.cpp +++ b/backends/PalmOS/Src/palmevt.cpp @@ -105,7 +105,7 @@ void OSystem_PALMOS::getCoordinates(EventPtr event, Coord *x, Coord *y) { } bool OSystem_PALMOS::pollEvent(Event &event) { - EventType ev; + ::EventType ev; Boolean handled; UInt32 keyCurrentState; Coord x, y; |