[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.29,1.30 palm.h,1.22,1.23

[Max Horn]

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

Modified Files:
	palm.cpp palm.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: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- palm.cpp	24 Feb 2004 22:39:35 -0000	1.29
+++ palm.cpp	28 Feb 2004 12:57:50 -0000	1.30
@@ -64,7 +64,7 @@
 	_adjustAspectRatio = ConfMan.getBool("aspect_ratio");
 }
 
-void OSystem_PALMOS::set_palette(const byte *colors, uint start, uint num) {
+void OSystem_PALMOS::setPalette(const byte *colors, uint start, uint num) {
 	if (_quitCount)
 		return;
 
@@ -134,7 +134,7 @@
 			_screenP	= _offScreenP;
 			_offScreenH	= WinGetDisplayWindow();
 			_screenH	= _offScreenH;	
-			_renderer_proc = &OSystem_PALMOS::update_screen__flipping;
+			_renderer_proc = &OSystem_PALMOS::updateScreen__flipping;
 			break;
 		case GFX_WIDE:
 		case GFX_BUFFERED:
@@ -153,13 +153,13 @@
 					gVars->screenLocked = true;
 					_screenP = WinScreenLock(winLockErase) + _screenOffset.addr;
 					_renderer_proc = (OPTIONS_TST(kOptModeLandscape)) ?
-						&OSystem_PALMOS::update_screen__wide_landscape :
-						&OSystem_PALMOS::update_screen__wide_portrait;
+						&OSystem_PALMOS::updateScreen__wide_landscape :
+						&OSystem_PALMOS::updateScreen__wide_portrait;
 				}
 
 			} else {
 				_screenP = (byte *)(BmpGetBits(WinGetBitmap(_screenH))) + _screenOffset.addr;
-				_renderer_proc =  &OSystem_PALMOS::update_screen__buffered;
+				_renderer_proc =  &OSystem_PALMOS::updateScreen__buffered;
 			}
 			_offScreenPitch = _screenWidth;
 			break;
@@ -170,7 +170,7 @@
 			_screenH = _offScreenH;
 			_offScreenP	= (byte *)(BmpGetBits(WinGetBitmap(_offScreenH))) + _screenOffset.addr;
 			_screenP	= _offScreenP;
-			_renderer_proc =  &OSystem_PALMOS::update_screen__direct;
+			_renderer_proc =  &OSystem_PALMOS::updateScreen__direct;
 			break;
 	}
 
@@ -178,7 +178,7 @@
 		WinSetCoordinateSystem(kCoordinatesNative);
 
 	// palette for preload dialog
-	set_palette(startupPalette,0,16);
+	setPalette(startupPalette,0,16);
 
 	// try to allocate on storage heap
 	FtrPtrNew(appFileCreator, ftrOverlayPtr, _screenWidth * _screenHeight, (void **)&_tmpScreenP);
@@ -389,7 +389,7 @@
 // Tapwave code will come here
 #endif
 
-void OSystem_PALMOS::update_screen__wide_portrait() {
+void OSystem_PALMOS::updateScreen__wide_portrait() {
 	UInt8 *dst = _screenP + _screenOffset.y;
 	UInt8 *src1 = _offScreenP + WIDE_PITCH - 1;
 
@@ -437,7 +437,7 @@
 	_screenP = WinScreenLock(winLockCopy) + _screenOffset.addr;
 }
 
-void OSystem_PALMOS::update_screen__wide_landscape() {
+void OSystem_PALMOS::updateScreen__wide_landscape() {
 	UInt8 *dst = _screenP;
 	UInt8 *src = _offScreenP;
 
@@ -475,7 +475,7 @@
 	_screenP = WinScreenLock(winLockCopy) + _screenOffset.addr;
 }
 
-void OSystem_PALMOS::update_screen__flipping() {
+void OSystem_PALMOS::updateScreen__flipping() {
 	RectangleType r, dummy;
 	Boolean shaked = false;
 
@@ -511,7 +511,7 @@
 
 }
 
-void OSystem_PALMOS::update_screen__buffered() {
+void OSystem_PALMOS::updateScreen__buffered() {
 	UInt32 move = 0;
 	UInt32 size = _screenWidth * _screenHeight;
 
@@ -557,7 +557,7 @@
 
 }
 
-void OSystem_PALMOS::update_screen__direct() {
+void OSystem_PALMOS::updateScreen__direct() {
 	if (_current_shake_pos != _new_shake_pos) {
 		if (_vibrate) {
 			Boolean active = (_new_shake_pos >= 3);
@@ -624,7 +624,7 @@
 	}
 }
 
-void OSystem_PALMOS::update_screen() {
+void OSystem_PALMOS::updateScreen() {
 	if(_quitCount)
 		return;
 
@@ -751,10 +751,10 @@
 }
 
 /* Mutex handling */
-OSystem::MutexRef OSystem_PALMOS::create_mutex() {return NULL;}
-void OSystem_PALMOS::lock_mutex(MutexRef mutex) {}
-void OSystem_PALMOS::unlock_mutex(MutexRef mutex) {}
-void OSystem_PALMOS::delete_mutex(MutexRef mutex) {}
+OSystem::MutexRef OSystem_PALMOS::createMutex() {return NULL;}
+void OSystem_PALMOS::lockMutex(MutexRef mutex) {}
+void OSystem_PALMOS::unlockMutex(MutexRef mutex) {}
+void OSystem_PALMOS::deleteMutex(MutexRef mutex) {}
 
 void OSystem_PALMOS::SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert, Boolean repeat) {
 	Int16 x = _mouseCurState.x;

Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- palm.h	24 Feb 2004 22:39:35 -0000	1.22
+++ palm.h	28 Feb 2004 12:57:50 -0000	1.23
@@ -46,7 +46,7 @@
 class OSystem_PALMOS : 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
@@ -61,7 +61,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);
@@ -129,10 +129,10 @@
 	void set_timer(TimerProc callback, int timer);
 
 	// Mutex handling
-	MutexRef create_mutex();
-	void lock_mutex(MutexRef mutex);
-	void unlock_mutex(MutexRef mutex);
-	void delete_mutex(MutexRef mutex);
+	MutexRef createMutex();
+	void lockMutex(MutexRef mutex);
+	void unlockMutex(MutexRef mutex);
+	void deleteMutex(MutexRef mutex);
 
 	// Quit
 	void quit();
@@ -170,12 +170,12 @@
 	typedef void (OSystem_PALMOS::*RendererProc)();
 	RendererProc _renderer_proc;
 
-	void update_screen__flipping();
-	void update_screen__buffered();
-	void update_screen__direct();
-	void update_screen__wide_portrait();
-	void update_screen__wide_landscape();
-	void update_screen__wide_zodiac();
+	void updateScreen__flipping();
+	void updateScreen__buffered();
+	void updateScreen__direct();
+	void updateScreen__wide_portrait();
+	void updateScreen__wide_landscape();
+	void updateScreen__wide_zodiac();
 
 	void *ptrP[5];	// various ptr