[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.8,1.9 wince-sdl.h,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Sat Feb 28 05:16:16 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/backends/wince

Modified Files:
	wince-sdl.cpp wince-sdl.h 
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wince-sdl.cpp	24 Feb 2004 22:39:37 -0000	1.8
+++ wince-sdl.cpp	28 Feb 2004 12:57:52 -0000	1.9
@@ -126,7 +126,7 @@
 		else
 			add_dirty_rect(0, 200, 320, 40);
 			
-		update_screen();
+		updateScreen();
 	}
 }
 
@@ -606,7 +606,7 @@
 	SDL_FreeSurface(old_tmpscreen);
 
 	// Blit everything to the screen
-	update_screen();
+	updateScreen();
 	
 	// Make sure that an EVENT_SCREEN_CHANGED gets sent later
 	_modeChanged = true;
@@ -623,7 +623,7 @@
 	}
 }
 
-void OSystem_WINCE3::update_screen() {
+void OSystem_WINCE3::updateScreen() {
 	assert(_hwscreen != NULL);
 
 	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
@@ -1254,7 +1254,7 @@
 
 			if (_toolbarHandler.action(temp_event.mouse.x, temp_event.mouse.y, true)) {
 				if (!_toolbarHandler.drawn())
-					update_screen();
+					updateScreen();
 				if (_newOrientation != _orientationLandscape) {
 					_orientationLandscape = _newOrientation;
 					ConfMan.set("CE_landscape", _orientationLandscape);
@@ -1281,7 +1281,7 @@
 
 			if (_toolbarHandler.action(temp_event.mouse.x, temp_event.mouse.y, false)) {
 				if (!_toolbarHandler.drawn())
-					update_screen();
+					updateScreen();
 			}
 			else {
 				if (!_freeLook)

Index: wince-sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wince-sdl.h	24 Feb 2004 22:39:37 -0000	1.4
+++ wince-sdl.h	28 Feb 2004 12:57:52 -0000	1.5
@@ -41,7 +41,7 @@
 	OSystem_WINCE3();
 
 	// Update the dirty areas of the screen
-	void update_screen();
+	void updateScreen();
 
 	// Set a parameter
 	uint32 property(int param, Property *value);





More information about the Scummvm-git-logs mailing list