From 14378cb56e18237cf1b8b5e088995e0b91f47410 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 28 Mar 2004 16:30:50 +0000
Subject: Renamed more OSystem methods

svn-id: r13410
---
 backends/sdl/graphics.cpp | 20 ++++++++++----------
 backends/sdl/sdl-common.h | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'backends/sdl')

diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
index 7ebb5e5d41..6842ab057c 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/sdl/graphics.cpp
@@ -532,7 +532,7 @@ void OSystem_SDL::setFullscreenMode(bool enable) {
 	}
 }
 
-void OSystem_SDL::copy_rect(const byte *src, int pitch, int x, int y, int w, int h) {
+void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) {
 	if (_screen == NULL)
 		return;
 
@@ -829,15 +829,15 @@ void OSystem_SDL::set_shake_pos(int shake_pos) {
 #pragma mark --- Overlays ---
 #pragma mark -
 
-void OSystem_SDL::show_overlay() {
+void OSystem_SDL::showOverlay() {
 	// hide the mouse
 	undraw_mouse();
 
 	_overlayVisible = true;
-	clear_overlay();
+	clearOverlay();
 }
 
-void OSystem_SDL::hide_overlay() {
+void OSystem_SDL::hideOverlay() {
 	// hide the mouse
 	undraw_mouse();
 
@@ -845,7 +845,7 @@ void OSystem_SDL::hide_overlay() {
 	_forceFull = true;
 }
 
-void OSystem_SDL::clear_overlay() {
+void OSystem_SDL::clearOverlay() {
 	if (!_overlayVisible)
 		return;
 	
@@ -866,7 +866,7 @@ void OSystem_SDL::clear_overlay() {
 	_forceFull = true;
 }
 
-void OSystem_SDL::grab_overlay(OverlayColor *buf, int pitch) {
+void OSystem_SDL::grabOverlay(OverlayColor *buf, int pitch) {
 	if (!_overlayVisible)
 		return;
 
@@ -890,7 +890,7 @@ void OSystem_SDL::grab_overlay(OverlayColor *buf, int pitch) {
 	SDL_UnlockSurface(_tmpscreen);
 }
 
-void OSystem_SDL::copy_rect_overlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_SDL::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
 	if (!_overlayVisible)
 		return;
 
@@ -953,7 +953,7 @@ void OSystem_SDL::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
 #pragma mark --- Mouse ---
 #pragma mark -
 
-bool OSystem_SDL::show_mouse(bool visible) {
+bool OSystem_SDL::showMouse(bool visible) {
 	if (_mouseVisible == visible)
 		return visible;
 	
@@ -977,7 +977,7 @@ void OSystem_SDL::set_mouse_pos(int x, int y) {
 	}
 }
 
-void OSystem_SDL::warp_mouse(int x, int y) {
+void OSystem_SDL::warpMouse(int x, int y) {
 	if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		SDL_WarpMouse(x * _scaleFactor, y * _scaleFactor);
 
@@ -992,7 +992,7 @@ void OSystem_SDL::warp_mouse(int x, int y) {
 	}
 }
 	
-void OSystem_SDL::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
+void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
 
 	undraw_mouse();
 
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index c71e147956..89a5b750fe 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -48,7 +48,7 @@ public:
 
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
-	void copy_rect(const byte *src, int pitch, int x, int y, int w, int h);
+	void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h);
 
 	void move_screen(int dx, int dy, int height);
 
@@ -56,15 +56,15 @@ public:
 	void updateScreen();
 
 	// Either show or hide the mouse cursor
-	bool show_mouse(bool visible);
+	bool showMouse(bool visible);
 	
 	// Warp the mouse cursor. Where set_mouse_pos() only informs the
 	// backend of the mouse cursor's current position, this function
 	// actually moves the cursor to the specified position.
-	void warp_mouse(int x, int y);
+	void warpMouse(int x, int y);
 
 	// Set the bitmap that's used when drawing the cursor.
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void set_shake_pos(int shake_pos);
@@ -111,11 +111,11 @@ public:
 	void deleteMutex(MutexRef mutex);
 
 	// Overlay
-	virtual void show_overlay();
-	virtual void hide_overlay();
-	virtual void clear_overlay();
-	virtual void grab_overlay(OverlayColor *buf, int pitch);
-	virtual void copy_rect_overlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
+	virtual void showOverlay();
+	virtual void hideOverlay();
+	virtual void clearOverlay();
+	virtual void grabOverlay(OverlayColor *buf, int pitch);
+	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	virtual int16 getHeight();
 	virtual int16 getWidth();
 
-- 
cgit v1.2.3