Renamed more OSystem methods

svn-id: r13410

4 files changed, 11 insertions, 11 deletions

diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 8cdb378aef..af0055dbca 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -168,7 +168,7 @@ void Graphics::drawMouse(void) {
 	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 @@ int32 Graphics::setMouseAnim(uint8 *ma, int32 size, int32 mouseFlash) {
 		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 @@ int32 Graphics::setLuggageAnim(uint8 *ma, int32 size) {
 		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;
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index 0b73a18b4c..9785ed2110 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -93,9 +93,9 @@ void AnimationState::updateScreen(void) {
 #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();
 }
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index bc0ec79319..025b99b164 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -99,7 +99,7 @@ void Graphics::updateDisplay(bool redrawScene) {
 			// 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 @@ void Graphics::updateDisplay(bool redrawScene) {
 					} 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 @@ void Graphics::updateDisplay(bool redrawScene) {
 				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;
 				}
 			}
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index ca53284333..3a235a0dbe 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -32,7 +32,7 @@ namespace Sword2 {
 #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);
 }