[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.41,1.42 morphos.h,1.28,1.29
Max Horn
fingolfin at users.sourceforge.net
Tue Sep 28 13:27:09 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3612/backends/morphos
Modified Files:
morphos.cpp morphos.h
Log Message:
Rename remaining OSystem methods to match our coding guidelines
Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- morphos.cpp 4 Sep 2004 01:31:00 -0000 1.41
+++ morphos.cpp 28 Sep 2004 20:19:22 -0000 1.42
@@ -307,14 +307,14 @@
return *req != NULL;
}
-uint32 OSystem_MorphOS::get_msecs()
+uint32 OSystem_MorphOS::getMillis()
{
int ticks = clock();
ticks *= (1000/CLOCKS_PER_SEC);
return ticks;
}
-void OSystem_MorphOS::delay_msecs(uint msecs)
+void OSystem_MorphOS::delayMillis(uint msecs)
{
/* TimerIORequest->tr_node.io_Command = TR_ADDREQUEST;
TimerIORequest->tr_time.tv_secs = 0;
@@ -456,7 +456,7 @@
return 0;
}
-void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int duration)
+void OSystem_MorphOS::playCD(int track, int num_loops, int start_frame, int duration)
{
if (CDrive && start_frame >= 0)
{
@@ -472,13 +472,13 @@
}
}
-void OSystem_MorphOS::stop_cdrom()
+void OSystem_MorphOS::stopCD()
{
if (CDrive)
CDDA_Stop(CDrive);
}
-bool OSystem_MorphOS::poll_cdrom()
+bool OSystem_MorphOS::pollCD()
{
ULONG status;
@@ -489,7 +489,7 @@
return status == CDDA_Status_Busy;
}
-void OSystem_MorphOS::update_cdrom()
+void OSystem_MorphOS::updateCD()
{
}
@@ -798,7 +798,7 @@
}
}
-bool OSystem_MorphOS::poll_event(Event *event)
+bool OSystem_MorphOS::pollEvent(Event &event)
{
IntuiMessage *ScummMsg;
@@ -823,9 +823,9 @@
qual |= KBD_SHIFT;
if (ScummMsg->Qualifier & IEQUALIFIER_CONTROL)
qual |= KBD_CTRL;
- event->kbd.flags = qual;
+ event.kbd.flags = qual;
- event->event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
+ event.event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
ScummMsg->Code &= ~IECODE_UP_PREFIX;
if (ScummMsg->Code >= RAWKEY_F1 && ScummMsg->Code <= RAWKEY_F10)
@@ -833,29 +833,29 @@
/*
* Function key
*/
- event->kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+315;
- event->kbd.keycode = 0;
+ event.kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+315;
+ event.kbd.keycode = 0;
}
else if (ScummMsg->Code == RAWKEY_F11 || ScummMsg->Code == RAWKEY_F12)
{
/*
* Function key on PC keyboard
*/
- event->kbd.ascii = (ScummMsg->Code == RAWKEY_F11) ? 325 : 326;
- event->kbd.keycode = 0;
+ event.kbd.ascii = (ScummMsg->Code == RAWKEY_F11) ? 325 : 326;
+ event.kbd.keycode = 0;
}
else if (ScummMsg->Code == NM_WHEEL_UP || ScummMsg->Code == NM_WHEEL_DOWN)
{
/*
* Wheelmouse event
*/
- event->event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
+ event.event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
}
else if (MapRawKey(&FakedIEvent, &charbuf, 1, NULL) == 1)
{
if (qual == KBD_CTRL && charbuf == 'z')
{
- event->event_code = EVENT_QUIT;
+ event.event_code = EVENT_QUIT;
break;
}
else if (qual == KBD_ALT)
@@ -870,7 +870,7 @@
}
else if (charbuf == 'x')
{
- event->event_code = EVENT_QUIT;
+ event.event_code = EVENT_QUIT;
break;
}
else if (charbuf == 0x0d)
@@ -881,8 +881,8 @@
}
}
- event->kbd.ascii = charbuf;
- event->kbd.keycode = charbuf;
+ event.kbd.ascii = charbuf;
+ event.kbd.keycode = charbuf;
}
break;
}
@@ -915,10 +915,10 @@
else if (FullScreenMode)
newy = newy <? (ScummScrHeight >> ScummScale)-2;
- event->event_code = EVENT_MOUSEMOVE;
- event->mouse.x = newx;
- event->mouse.y = newy;
- set_mouse_pos(event->mouse.x, event->mouse.y);
+ event.event_code = EVENT_MOUSEMOVE;
+ event.mouse.x = newx;
+ event.mouse.y = newy;
+ set_mouse_pos(event.mouse.x, event.mouse.y);
break;
}
@@ -932,32 +932,32 @@
switch (ScummMsg->Code)
{
case SELECTDOWN:
- event->event_code = EVENT_LBUTTONDOWN;
+ event.event_code = EVENT_LBUTTONDOWN;
break;
case SELECTUP:
- event->event_code = EVENT_LBUTTONUP;
+ event.event_code = EVENT_LBUTTONUP;
break;
case MENUDOWN:
- event->event_code = EVENT_RBUTTONDOWN;
+ event.event_code = EVENT_RBUTTONDOWN;
break;
case MENUUP:
- event->event_code = EVENT_RBUTTONUP;
+ event.event_code = EVENT_RBUTTONUP;
break;
default:
ReplyMsg((Message *)ScummMsg);
return false;
}
- event->mouse.x = newx;
- event->mouse.y = newy;
+ event.mouse.x = newx;
+ event.mouse.y = newy;
break;
}
case IDCMP_CLOSEWINDOW:
- event->event_code = EVENT_QUIT;
+ event.event_code = EVENT_QUIT;
break;
}
@@ -1007,7 +1007,7 @@
}
}
-void OSystem_MorphOS::set_shake_pos(int shake_pos)
+void OSystem_MorphOS::setShakePos(int shake_pos)
{
ScummShakePos = shake_pos;
AddUpdateRect(0, 0, ScummBufferWidth, ScummBufferHeight);
Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- morphos.h 4 Sep 2004 01:31:00 -0000 1.28
+++ morphos.h 28 Sep 2004 20:19:22 -0000 1.29
@@ -66,7 +66,7 @@
virtual 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.
- virtual void set_shake_pos(int shake_pos);
+ virtual void setShakePos(int shake_pos);
// Overlay
virtual void showOverlay();
@@ -78,10 +78,10 @@
virtual int16 getWidth();
// Get the number of milliseconds since the program was started.
- virtual uint32 get_msecs();
+ virtual uint32 getMillis();
// Delay for a specified amount of milliseconds
- virtual void delay_msecs(uint msecs);
+ virtual void delayMillis(uint msecs);
// Add a new callback timer
virtual void setTimerCallback(TimerProc callback, int timer);
@@ -94,7 +94,7 @@
// Get the next event.
// Returns true if an event was retrieved.
- virtual bool poll_event(Event *event);
+ virtual bool pollEvent(Event &event);
// Moves mouse pointer to specified position
virtual void warpMouse(int x, int y);
@@ -108,16 +108,16 @@
// Poll cdrom status
// Returns true if cd audio is playing
- virtual bool poll_cdrom();
+ virtual bool pollCD();
// Play cdrom audio track
- virtual void play_cdrom(int track, int num_loops, int start_frame, int duration);
+ virtual void playCD(int track, int num_loops, int start_frame, int duration);
// Stop cdrom audio track
- virtual void stop_cdrom();
+ virtual void stopCD();
// Update cdrom audio status
- virtual void update_cdrom();
+ virtual void updateCD();
// Quit
virtual void quit();
More information about the Scummvm-git-logs
mailing list