[Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.3,2.4 gfx.cpp,2.269,2.270 saveload.cpp,1.148,1.149 script_v8.cpp,2.240,2.241 scumm.cpp,1.9,1.10

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


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

Modified Files:
	cursor.cpp gfx.cpp saveload.cpp script_v8.cpp scumm.cpp 
Log Message:
Renamed more OSystem methods

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- cursor.cpp	6 Jan 2004 12:45:30 -0000	2.3
+++ cursor.cpp	28 Mar 2004 16:30:48 -0000	2.4
@@ -168,7 +168,7 @@
 }
 
 void ScummEngine::updateCursor() {
-	_system->set_mouse_cursor(_grabbedCursor, _cursor.width, _cursor.height,
+	_system->setMouseCursor(_grabbedCursor, _cursor.width, _cursor.height,
 							_cursor.hotspotX, _cursor.hotspotY);
 }
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.269
retrieving revision 2.270
diff -u -d -r2.269 -r2.270
--- gfx.cpp	28 Feb 2004 12:58:09 -0000	2.269
+++ gfx.cpp	28 Mar 2004 16:30:48 -0000	2.270
@@ -408,7 +408,7 @@
 	// We don't clip height and width here, rather we rely on the backend to
 	// perform any needed clipping.
 	ptr = vs->screenPtr + (x + vs->xstart) + top * vs->width;
-	_vm->_system->copy_rect(ptr, vs->width, x, vs->topline + top - _vm->_screenTop, width, height);
+	_vm->_system->copyRectToScreen(ptr, vs->width, x, vs->topline + top - _vm->_screenTop, width, height);
 }
 
 #pragma mark -
@@ -2548,7 +2548,7 @@
 	for (i = 0; i < w * h; i++) {
 		x = offsets[i] % vs->width;
 		y = offsets[i] / vs->width;
-		_system->copy_rect(vs->screenPtr + vs->xstart + y * vs->width + x, vs->width, x, y + vs->topline, width, height);
+		_system->copyRectToScreen(vs->screenPtr + vs->xstart + y * vs->width + x, vs->width, x, y + vs->topline, width, height);
 
 		if (++blits >= blits_before_refresh) {
 			blits = 0;
@@ -2584,7 +2584,7 @@
 		y = 1 + step;
 		while (y < vs->height) {
 			_system->move_screen(0, -step, vs->height);
-			_system->copy_rect(vs->screenPtr + vs->xstart + (y - step) * vs->width,
+			_system->copyRectToScreen(vs->screenPtr + vs->xstart + (y - step) * vs->width,
 				vs->width,
 				0, vs->height - step,
 				vs->width, step);
@@ -2599,7 +2599,7 @@
 		y = 1 + step;
 		while (y < vs->height) {
 			_system->move_screen(0, step, vs->height);
-			_system->copy_rect(vs->screenPtr + vs->xstart + vs->width * (vs->height-y),
+			_system->copyRectToScreen(vs->screenPtr + vs->xstart + vs->width * (vs->height-y),
 				vs->width,
 				0, 0,
 				vs->width, step);
@@ -2614,7 +2614,7 @@
 		x = 1 + step;
 		while (x < vs->width) {
 			_system->move_screen(-step, 0, vs->height);
-			_system->copy_rect(vs->screenPtr + vs->xstart + x - step,
+			_system->copyRectToScreen(vs->screenPtr + vs->xstart + x - step,
 				vs->width,
 				vs->width - step, 0,
 				step, vs->height);
@@ -2629,7 +2629,7 @@
 		x = 1 + step;
 		while (x < vs->width) {
 			_system->move_screen(step, 0, vs->height);
-			_system->copy_rect(vs->screenPtr + vs->xstart + vs->width - x,
+			_system->copyRectToScreen(vs->screenPtr + vs->xstart + vs->width - x,
 				vs->width,
 				0, 0,
 				step, vs->height);

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- saveload.cpp	17 Mar 2004 01:50:14 -0000	1.148
+++ saveload.cpp	28 Mar 2004 16:30:49 -0000	1.149
@@ -644,7 +644,7 @@
 
 	if (s->isLoading() && savegameVersion >= VER(20)) {
 		updateCursor();
-		_system->warp_mouse(_mouse.x, _mouse.y);
+		_system->warpMouse(_mouse.x, _mouse.y);
 	}
 
 	s->saveLoadArrayOf(_actors, _numActors, sizeof(_actors[0]), actorEntries);

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.240
retrieving revision 2.241
diff -u -d -r2.240 -r2.241
--- script_v8.cpp	19 Mar 2004 23:19:57 -0000	2.240
+++ script_v8.cpp	28 Mar 2004 16:30:49 -0000	2.241
@@ -779,7 +779,7 @@
 		int y = pop();
 		int x = pop();
 
-		_system->warp_mouse(x, y);
+		_system->warpMouse(x, y);
 		}
 		break;
 	default:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scumm.cpp	28 Mar 2004 13:28:44 -0000	1.9
+++ scumm.cpp	28 Mar 2004 16:30:49 -0000	1.10
@@ -1587,7 +1587,7 @@
 	animateCursor();
 	
 	/* show or hide mouse */
-	_system->show_mouse(_cursor.state > 0);
+	_system->showMouse(_cursor.state > 0);
 
 	if (VAR_TIMER != 0xFF)
 		VAR(VAR_TIMER) = 0;





More information about the Scummvm-git-logs mailing list