[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.39,1.40

Chris Apers chrilith at users.sourceforge.net
Mon Dec 20 09:10:00 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32138

Modified Files:
	palm.cpp 
Log Message:
Prevent conflict with the new OSystem enum

Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- palm.cpp	9 Nov 2004 11:23:49 -0000	1.39
+++ palm.cpp	20 Dec 2004 17:09:06 -0000	1.40
@@ -82,7 +82,7 @@
 	}
 
 	if (voltage <= criticalThreshold) {
-		EventType event;
+		::EventType event;
 		event.eType = keyDownEvent;
 		event.data.keyDown.chr = vchrAutoOff;
 		event.data.keyDown.modifiers = commandKeyMask;
@@ -187,7 +187,7 @@
 		case kFeatureAspectRatioCorrection:
 			if (_mode == GFX_WIDE && OPTIONS_TST(kOptDeviceZodiac)) {
 				_adjustAspectRatio ^= true;
-				ClearScreen();
+				clearScreen();
 			}
 			break;
 	}
@@ -300,9 +300,3 @@
 	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);
-}





More information about the Scummvm-git-logs mailing list