[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.431,1.432

Max Horn fingolfin at users.sourceforge.net
Sun Mar 28 08:43:13 CEST 2004


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/simon

Modified Files:
	simon.cpp 
Log Message:
Renamed more OSystem methods

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -d -r1.431 -r1.432
--- simon.cpp	15 Mar 2004 14:03:56 -0000	1.431
+++ simon.cpp	28 Mar 2004 16:30:49 -0000	1.432
@@ -1548,11 +1548,11 @@
 	uint x;
 
 	if (_lock_counter) {
-		_system->show_mouse(false);
+		_system->showMouse(false);
 		return;
 	}
 
-	_system->show_mouse(true);
+	_system->showMouse(true);
 	pollMouseXY();
 
 	if (_mouse_x >= 32768)
@@ -3764,9 +3764,9 @@
 
 void SimonEngine::draw_mouse_pointer() {
 	if (_game & GF_SIMON2)
-		_system->set_mouse_cursor(_simon2_cursors[_mouse_cursor], 16, 16, 7, 7);
+		_system->setMouseCursor(_simon2_cursors[_mouse_cursor], 16, 16, 7, 7);
 	else
-		_system->set_mouse_cursor(_simon1_cursor, 16, 16, 0, 0);
+		_system->setMouseCursor(_simon1_cursor, 16, 16, 0, 0);
 }
 
 // Thanks to Stuart Caie for providing the original
@@ -4434,7 +4434,7 @@
 void SimonEngine::dx_clear_surfaces(uint num_lines) {
 	memset(_sdl_buf_attached, 0, num_lines * 320);
 
-	_system->copy_rect(_sdl_buf_attached, 320, 0, 0, 320, 200);
+	_system->copyRectToScreen(_sdl_buf_attached, 320, 0, 0, 320, 200);
 
 	if (_dx_use_3_or_4_for_lock) {
 		memset(_sdl_buf, 0, num_lines * 320);
@@ -4485,7 +4485,7 @@
 		}
 	}
 
-	_system->copy_rect(_sdl_buf_attached, 320, 0, 0, 320, 200);
+	_system->copyRectToScreen(_sdl_buf_attached, 320, 0, 0, 320, 200);
 	_system->updateScreen();
 
 	memcpy(_sdl_buf_attached, _sdl_buf, 320 * 200);





More information about the Scummvm-git-logs mailing list