[Scummvm-cvs-logs] CVS: scummvm/backends/gp32 gp32.cpp,1.16,1.17 gp32.h,1.15,1.16

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/gp32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/backends/gp32

Modified Files:
	gp32.cpp gp32.h 
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend

Index: gp32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gp32.cpp	24 Feb 2004 22:39:36 -0000	1.16
+++ gp32.cpp	28 Feb 2004 12:57:51 -0000	1.17
@@ -36,7 +36,7 @@
 FILE *fstderr, *fstdout, *fstdin;

 

 // Set colors of the palette

-void OSystem_GP32::set_palette(const byte *colors, uint start, uint num) { 

+void OSystem_GP32::setPalette(const byte *colors, uint start, uint num) { 

 	const byte *b = colors;

 	uint i;

 	SDL_Color *base = _currentPalette + start;

@@ -692,7 +692,7 @@
 }

 

 // Update the dirty areas of the screen

-void OSystem_GP32::update_screen() { 

+void OSystem_GP32::updateScreen() { 

 	assert(sdl_hwscreen != NULL);

 

 	// If the shake position changed, fill the dirty area with blackness

@@ -1017,7 +1017,7 @@
 	copy_rect(bak_mem, _screenWidth, 0, 0, _screenWidth, _screenHeight);

 	free(bak_mem);

 

-	update_screen();

+	updateScreen();

 }

 	

 // Get or set a property

@@ -1072,12 +1072,12 @@
 void OSystem_GP32::set_timer(TimerProc callback, int timer) { }

 

 // Mutex handling

-OSystem::MutexRef OSystem_GP32::create_mutex() {

+OSystem::MutexRef OSystem_GP32::createMutex() {

 	return NULL;

 }

-void OSystem_GP32::lock_mutex(MutexRef mutex) { }

-void OSystem_GP32::unlock_mutex(MutexRef mutex) { }

-void OSystem_GP32::delete_mutex(MutexRef mutex) { }

+void OSystem_GP32::lockMutex(MutexRef mutex) { }

+void OSystem_GP32::unlockMutex(MutexRef mutex) { }

+void OSystem_GP32::deleteMutex(MutexRef mutex) { }

 

 // Quit

 void gphalt(int);


Index: gp32.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gp32.h	24 Feb 2004 22:39:36 -0000	1.15
+++ gp32.h	28 Feb 2004 12:57:51 -0000	1.16
@@ -35,7 +35,7 @@
 class OSystem_GP32 : public OSystem {

 public:

 	// Set colors of the palette

-	void set_palette(const byte *colors, uint start, uint num);

+	void setPalette(const byte *colors, uint start, uint num);

 

 	// Set the size of the video bitmap.

 	// Typically, 320x200

@@ -52,7 +52,7 @@
 	void move_screen(int dx, int dy, int height);

 

 	// Update the dirty areas of the screen

-	void update_screen();

+	void updateScreen();

 

 	// Either show or hide the mouse cursor

 	bool show_mouse(bool visible);

@@ -103,10 +103,10 @@
 	void set_timer(TimerProc callback, int timer);

 

 	// Mutex handling

-	OSystem::MutexRef create_mutex();

-	void lock_mutex(MutexRef mutex);

-	void unlock_mutex(MutexRef mutex);

-	void delete_mutex(MutexRef mutex);

+	OSystem::MutexRef createMutex();

+	void lockMutex(MutexRef mutex);

+	void unlockMutex(MutexRef mutex);

+	void deleteMutex(MutexRef mutex);

 

 	// Quit

 	void quit();

@@ -149,7 +149,7 @@
 		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 3

 	};

 

-	bool _forceFull; // Force full redraw on next update_screen

+	bool _forceFull; // Force full redraw on next updateScreen

 	int _scaleFactor;

 	int _mode;

 	bool _full_screen;