[Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.32,1.33 animation.cpp,1.37,1.38 rdwin.cpp,1.44,1.45 render.cpp,1.58,1.59

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


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

Modified Files:
	_mouse.cpp animation.cpp rdwin.cpp render.cpp 
Log Message:
Renamed more OSystem methods

Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- _mouse.cpp	5 Feb 2004 14:19:06 -0000	1.32
+++ _mouse.cpp	28 Mar 2004 16:30:50 -0000	1.33
@@ -168,7 +168,7 @@
 	if (_mouseAnim)
 		decompressMouse(_mouseData, _mouseSprite, _mouseAnim->mousew, _mouseAnim->mouseh, mouse_width);
 
-	_vm->_system->set_mouse_cursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y);
+	_vm->_system->setMouseCursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y);
 }
 
 /**
@@ -222,12 +222,12 @@
 		animateMouse();
 		drawMouse();
 
-		_vm->_system->show_mouse(true);
+		_vm->_system->showMouse(true);
 	} else {
 		if (_luggageAnim)
 			drawMouse();
 		else
-			_vm->_system->show_mouse(false);
+			_vm->_system->showMouse(false);
 	}
 
 	return RD_OK;
@@ -257,12 +257,12 @@
 		animateMouse();
 		drawMouse();
 
-		_vm->_system->show_mouse(true);
+		_vm->_system->showMouse(true);
 	} else {
 		if (_mouseAnim)
 			drawMouse();
 		else
-			_vm->_system->show_mouse(false);
+			_vm->_system->showMouse(false);
 	}
 
 	return RD_OK;

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- animation.cpp	28 Mar 2004 13:10:52 -0000	1.37
+++ animation.cpp	28 Mar 2004 16:30:50 -0000	1.38
@@ -93,9 +93,9 @@
 #ifdef BACKEND_8BIT
 	byte *buf = _vm->_graphics->getScreen() + ((480 - MOVIE_HEIGHT) / 2) * RENDERWIDE + (640 - MOVIE_WIDTH) / 2;
 
-	_vm->_system->copy_rect(buf, MOVIE_WIDTH, (640 - MOVIE_WIDTH) / 2, (480 - MOVIE_HEIGHT) / 2, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_vm->_system->copyRectToScreen(buf, MOVIE_WIDTH, (640 - MOVIE_WIDTH) / 2, (480 - MOVIE_HEIGHT) / 2, MOVIE_WIDTH, MOVIE_HEIGHT);
 #else
-	_sys->copy_rect_overlay(overlay, MOVIE_WIDTH, 0, 0, MOVIE_WIDTH, MOVIE_HEIGHT);
+	_sys->copyRectToOverlay(overlay, MOVIE_WIDTH, 0, 0, MOVIE_WIDTH, MOVIE_HEIGHT);
 #endif
 	_vm->_system->updateScreen();
 }

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- rdwin.cpp	28 Feb 2004 12:58:13 -0000	1.44
+++ rdwin.cpp	28 Mar 2004 16:30:50 -0000	1.45
@@ -99,7 +99,7 @@
 			// Update the entire screen. This is necessary when
 			// scrolling, fading, etc.
 
-			_vm->_system->copy_rect(_buffer + MENUDEEP * _screenWide, _screenWide, 0, MENUDEEP, _screenWide, _screenDeep - 2 * MENUDEEP);
+			_vm->_system->copyRectToScreen(_buffer + MENUDEEP * _screenWide, _screenWide, 0, MENUDEEP, _screenWide, _screenDeep - 2 * MENUDEEP);
 			_needFullRedraw = false;
 		} else {
 			// Update only the dirty areas of the screen
@@ -116,7 +116,7 @@
 					} else if (stripWide) {
 						x = CELLWIDE * (j - stripWide);
 						y = CELLDEEP * i;
-						_vm->_system->copy_rect(_buffer + y * _screenWide + x, _screenWide, x, y, stripWide * CELLWIDE, CELLDEEP);
+						_vm->_system->copyRectToScreen(_buffer + y * _screenWide + x, _screenWide, x, y, stripWide * CELLWIDE, CELLDEEP);
 						stripWide = 0;
 					}
 				}
@@ -124,7 +124,7 @@
 				if (stripWide) {
 					x = CELLWIDE * (j - stripWide);
 					y = CELLDEEP * i;
-					_vm->_system->copy_rect(_buffer + y * _screenWide + x, _screenWide, x, y, stripWide * CELLWIDE, CELLDEEP);
+					_vm->_system->copyRectToScreen(_buffer + y * _screenWide + x, _screenWide, x, y, stripWide * CELLWIDE, CELLDEEP);
 					stripWide = 0;
 				}
 			}

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- render.cpp	15 Mar 2004 00:55:44 -0000	1.58
+++ render.cpp	28 Mar 2004 16:30:50 -0000	1.59
@@ -32,7 +32,7 @@
 #define BLOCKHBITS		6
 
 void Graphics::updateRect(Common::Rect *r) {
-	_vm->_system->copy_rect(_buffer + r->top * _screenWide + r->left,
+	_vm->_system->copyRectToScreen(_buffer + r->top * _screenWide + r->left,
 		_screenWide, r->left, r->top, r->right - r->left,
 		r->bottom - r->top);
 }





More information about the Scummvm-git-logs mailing list