[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.34,1.35 morphos.h,1.21,1.22

Max Horn fingolfin at users.sourceforge.net
Sat Feb 28 05:17:01 CET 2004


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

Modified Files:
	morphos.cpp morphos.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: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- morphos.cpp	24 Feb 2004 22:39:36 -0000	1.34
+++ morphos.cpp	28 Feb 2004 12:57:51 -0000	1.35
@@ -327,7 +327,7 @@
 	warning("set_timer() unexpectedly called");
 }
 
-OSystem::MutexRef OSystem_MorphOS::create_mutex()
+OSystem::MutexRef OSystem_MorphOS::createMutex()
 {
 	SignalSemaphore *sem = (SignalSemaphore *) AllocVec(sizeof (SignalSemaphore), MEMF_PUBLIC);
 
@@ -337,17 +337,17 @@
 	return (MutexRef)sem;
 }
 
-void OSystem_MorphOS::lock_mutex(MutexRef mutex)
+void OSystem_MorphOS::lockMutex(MutexRef mutex)
 {
 	ObtainSemaphore((SignalSemaphore *) mutex);
 }
 
-void OSystem_MorphOS::unlock_mutex(MutexRef mutex)
+void OSystem_MorphOS::unlockMutex(MutexRef mutex)
 {
 	ReleaseSemaphore((SignalSemaphore *)mutex);
 }
 
-void OSystem_MorphOS::delete_mutex(MutexRef mutex)
+void OSystem_MorphOS::deleteMutex(MutexRef mutex)
 {
 	FreeVec(mutex);
 }
@@ -519,7 +519,7 @@
 
 #define CVT8TO32(col)   ((col<<24) | (col<<16) | (col<<8) | col)
 
-void OSystem_MorphOS::set_palette(const byte *colors, uint start, uint num)
+void OSystem_MorphOS::setPalette(const byte *colors, uint start, uint num)
 {
 	const byte *data = colors;
 	UWORD changed_colors[256];
@@ -1170,7 +1170,7 @@
 	return true;
 }
 
-void OSystem_MorphOS::update_screen()
+void OSystem_MorphOS::updateScreen()
 {
 	AUTO_LOCK
 

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- morphos.h	24 Feb 2004 22:39:36 -0000	1.21
+++ morphos.h	28 Feb 2004 12:57:51 -0000	1.22
@@ -43,7 +43,7 @@
 		bool Initialise();
 
 		// Set colors of the palette
-		virtual void set_palette(const byte *colors, uint start, uint num);
+		virtual void setPalette(const byte *colors, uint start, uint num);
 
 		// Set the size of the video bitmap.
 		// Typically, 320x200
@@ -55,7 +55,7 @@
 		void move_screen(int dx, int dy, int height);
 
 		// Update the dirty areas of the screen
-		virtual void update_screen();
+		virtual void updateScreen();
 
 		// Either show or hide the mouse cursor
 		virtual bool show_mouse(bool visible);
@@ -88,10 +88,10 @@
 		virtual void set_timer(TimerProc callback, int timer);
 
 		// Mutex handling
-		virtual MutexRef create_mutex();
-		virtual void lock_mutex(MutexRef mutex);
-		virtual void unlock_mutex(MutexRef mutex);
-		virtual void delete_mutex(MutexRef mutex);
+		virtual MutexRef createMutex();
+		virtual void lockMutex(MutexRef mutex);
+		virtual void unlockMutex(MutexRef mutex);
+		virtual void deleteMutex(MutexRef mutex);
 
 		// Get the next event.
 		// Returns true if an event was retrieved.





More information about the Scummvm-git-logs mailing list