Renamed more OSystem methods

svn-id: r13410

7 files changed, 14 insertions, 14 deletions

diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index cfac7aaad7..b2c6f29676 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -168,7 +168,7 @@ void ScummEngine::setCursorHotspot(int x, int y) {
 }
 
 void ScummEngine::updateCursor() {
-	_system->set_mouse_cursor(_grabbedCursor, _cursor.width, _cursor.height,
+	_system->setMouseCursor(_grabbedCursor, _cursor.width, _cursor.height,
 							_cursor.hotspotX, _cursor.hotspotY);
 }
 
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 8d4295e9e2..75275c485e 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -408,7 +408,7 @@ void Gdi::drawStripToScreen(VirtScreen *vs, int x, int width, int top, int botto
 	// 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 @@ void ScummEngine::dissolveEffect(int width, int height) {
 	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 @@ void ScummEngine::scrollEffect(int dir) {
 		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 @@ void ScummEngine::scrollEffect(int dir) {
 		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 @@ void ScummEngine::scrollEffect(int dir) {
 		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 @@ void ScummEngine::scrollEffect(int dir) {
 		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);
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 82fbd9b14d..7914433f11 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -619,7 +619,7 @@ void Insane::startVideo(const char *filename, int num, int argC, int frameRate,
 }
 
 void Insane::smush_warpMouse(int x, int y, int buttons) {
-	_vm->_system->warp_mouse(x, y);
+	_vm->_system->warpMouse(x, y);
 }
 
 void Insane::putActors(void) {
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 4171b63eb1..6ec5243d11 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -644,7 +644,7 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 
 	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);
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 4b0d0624b5..9c32b6e9ad 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -779,7 +779,7 @@ void ScummEngine_v8::o8_cursorCommand() {
 		int y = pop();
 		int x = pop();
 
-		_system->warp_mouse(x, y);
+		_system->warpMouse(x, y);
 		}
 		break;
 	default:
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 26fa409543..bc80c0b198 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1587,7 +1587,7 @@ load_game:
 	animateCursor();
 	
 	/* show or hide mouse */
-	_system->show_mouse(_cursor.state > 0);
+	_system->showMouse(_cursor.state > 0);
 
 	if (VAR_TIMER != 0xFF)
 		VAR(VAR_TIMER) = 0;
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index fd6d0fea3f..6ebbfbe4ae 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -966,7 +966,7 @@ void SmushPlayer::updateScreen() {
 #endif
 
 	uint32 end_time, start_time = _vm->_system->get_msecs();
-	_vm->_system->copy_rect(_dst, _width, 0, 0, _width, _height);
+	_vm->_system->copyRectToScreen(_dst, _width, 0, 0, _width, _height);
 	_updateNeeded = true;
 	end_time = _vm->_system->get_msecs();
 	debug(4, "Smush stats: updateScreen( %03d )", end_time - start_time);
@@ -1026,7 +1026,7 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
 	_updateNeeded = false;
 	
 	// Hide mouse
-	bool oldMouseState = _vm->_system->show_mouse(false);
+	bool oldMouseState = _vm->_system->showMouse(false);
 
 	// Load the video
 	setupAnim(filename, directory);
@@ -1065,7 +1065,7 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
 	deinit();
 	
 	// Reset mouse state
-	_vm->_system->show_mouse(oldMouseState);
+	_vm->_system->showMouse(oldMouseState);
 }
 
 } // End of namespace Scumm