[Scummvm-cvs-logs] CVS: scummvm/backends/gp32 gp32.cpp,1.21,1.22 gp32.h,1.22,1.23

[Max Horn]

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

Modified Files:
	gp32.cpp gp32.h 
Log Message:
Rename remaining OSystem methods to match our coding guidelines

Index: gp32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gp32.cpp	4 Sep 2004 01:31:00 -0000	1.21
+++ gp32.cpp	28 Sep 2004 20:19:22 -0000	1.22
@@ -812,17 +812,17 @@
 }

 	

 // Shaking is used in SCUMM. Set current shake position.

-void OSystem_GP32::set_shake_pos(int shake_pos) { 

+void OSystem_GP32::setShakePos(int shake_pos) { 

 	_newShakePos = shake_pos;

 }

 		

 // Get the number of milliseconds since the program was started.

-uint32 OSystem_GP32::get_msecs() { 

+uint32 OSystem_GP32::getMillis() { 

 	return GpTickCountGet(); 

 }

 	

 // Delay for a specified amount of milliseconds

-void OSystem_GP32::delay_msecs(uint msecs) { 

+void OSystem_GP32::delayMillis(uint msecs) { 

 	int n = GpTickCountGet();

 	while ( ( GpTickCountGet() - n ) < msecs) ;

 }

@@ -830,7 +830,7 @@
 // Get the next event.

 // Returns true if an event was retrieved.	

 

-bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly :)

+bool OSystem_GP32::pollEvent(Event &event) { 	// fixme: make more user-friendly :)

 

 	#define EVENT_COUNT	2 // >=1

 	#define MOUSE_MIPS	1 // bg updates wrong if >1 ??

@@ -842,7 +842,7 @@
 	if (key == GPC_VK_NONE) {

 		if (lastevent==EVENT_LBUTTONDOWN) {

 			lastevent=0;

-			event->event_code = EVENT_LBUTTONUP;

+			event.event_code = EVENT_LBUTTONUP;

 			return true;

 		}

 		return false;

@@ -855,7 +855,7 @@
 	oldkey=key;

 	eventcount=EVENT_COUNT;

 

-	event->event_code = EVENT_KEYDOWN;

+	event.event_code = EVENT_KEYDOWN;

 

 	if (key & GPC_VK_FL && key & GPC_VK_FR) { // L+R = save state

 		printf("Saving game, please wait...");

@@ -888,27 +888,27 @@
 	}

 

 	if (key & GPC_VK_START) { // START = menu

-		event->kbd.keycode = 319;

-		event->kbd.ascii = 319;

+		event.kbd.keycode = 319;

+		event.kbd.ascii = 319;

 		return true;			

 	}

 

 	if (key & GPC_VK_SELECT) { // SELECT == escape/skip

 		if (_overlay_visible) 

 			do key=GpKeyGet(); while (key != GPC_VK_NONE) ; // prevent 2xESC

-		event->kbd.keycode = 27;

-		event->kbd.ascii = 27;		

+		event.kbd.keycode = 27;

+		event.kbd.ascii = 27;		

 		return true;

 	}		

 

 	if (key & GPC_VK_FA) {

 		lastevent=EVENT_LBUTTONDOWN;

-		event->event_code = EVENT_LBUTTONDOWN;

+		event.event_code = EVENT_LBUTTONDOWN;

 		return true;

 	}

 	if (key & GPC_VK_FB) {

 		lastevent=EVENT_RBUTTONDOWN;

-		event->event_code = EVENT_RBUTTONDOWN;

+		event.event_code = EVENT_RBUTTONDOWN;

 		return true;

 	}

 

@@ -932,14 +932,14 @@
 		if (my>199) my=199;

 	}

 

-	event->event_code = EVENT_MOUSEMOVE;

-	km.x = event->mouse.x = mx;

-	km.y = event->mouse.y = my;

+	event.event_code = EVENT_MOUSEMOVE;

+	km.x = event.mouse.x = mx;

+	km.y = event.mouse.y = my;

 

-	event->mouse.x /= _scaleFactor;

-	event->mouse.y /= _scaleFactor;	

+	event.mouse.x /= _scaleFactor;

+	event.mouse.y /= _scaleFactor;	

 

-	set_mouse_pos(event->mouse.x, event->mouse.y);

+	set_mouse_pos(event.mouse.x, event.mouse.y);

 }

 

 // Set the function to be invoked whenever samples need to be generated

@@ -1026,16 +1026,16 @@
 		

 // Poll cdrom status

 // Returns true if cd audio is playing

-bool OSystem_GP32::poll_cdrom() { return false; }

+bool OSystem_GP32::pollCD() { return false; }

 

 // Play cdrom audio track

-void OSystem_GP32::play_cdrom(int track, int num_loops, int start_frame, int duration) { }

+void OSystem_GP32::playCD(int track, int num_loops, int start_frame, int duration) { }

 

 // Stop cdrom audio track

-void OSystem_GP32::stop_cdrom() { }

+void OSystem_GP32::stopCD() { }

 

 // Update cdrom audio status

-void OSystem_GP32::update_cdrom() { }

+void OSystem_GP32::updateCD() { }

 

 // Add a new callback timer

 void OSystem_GP32::setTimerCallback(TimerProc callback, int timer) { }


Index: gp32.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gp32.h	4 Sep 2004 01:31:00 -0000	1.22
+++ gp32.h	28 Sep 2004 20:19:22 -0000	1.23
@@ -61,17 +61,17 @@
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);

 	

 	// Shaking is used in SCUMM. Set current shake position.

-	void set_shake_pos(int shake_pos);

+	void setShakePos(int shake_pos);

 		

 	// Get the number of milliseconds since the program was started.

-	uint32 get_msecs();

+	uint32 getMillis();

 	

 	// Delay for a specified amount of milliseconds

-	void delay_msecs(uint msecs);

+	void delayMillis(uint msecs);

 	

 	// Get the next event.

 	// Returns true if an event was retrieved.	

-	bool poll_event(Event *event);

+	bool pollEvent(Event &event);

 

 	// Set the function to be invoked whenever samples need to be generated

 	// Format is the sample type format.

@@ -84,16 +84,16 @@
 		

 	// Poll cdrom status

 	// Returns true if cd audio is playing

-	bool poll_cdrom();

+	bool pollCD();

 

 	// Play cdrom audio track

-	void play_cdrom(int track, int num_loops, int start_frame, int duration);

+	void playCD(int track, int num_loops, int start_frame, int duration);

 

 	// Stop cdrom audio track

-	void stop_cdrom();

+	void stopCD();

 

 	// Update cdrom audio status

-	void update_cdrom();

+	void updateCD();

 

 	// Add a new callback timer

 	void setTimerCallback(TimerProc callback, int timer);