aboutsummaryrefslogtreecommitdiff
path: root/backends/morphos/morphos.h
diff options
context:
space:
mode:
authorMax Horn2004-09-28 20:19:37 +0000
committerMax Horn2004-09-28 20:19:37 +0000
commitce8c99bf62838099142aa79f2935e64639aa5571 (patch)
tree5a2ea91139133878cdffab8ed86033fbf5448ea9 /backends/morphos/morphos.h
parent6a50ba2308c6a9fc3eb733f310c87ed279b565ed (diff)
downloadscummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.gz
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.bz2
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.zip
Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
Diffstat (limited to 'backends/morphos/morphos.h')
-rw-r--r--backends/morphos/morphos.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 0279bc3517..30c7c04edf 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -66,7 +66,7 @@ class OSystem_MorphOS : public OSystem
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 @@ class OSystem_MorphOS : public OSystem
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 @@ class OSystem_MorphOS : public OSystem
// 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 @@ class OSystem_MorphOS : public OSystem
// 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();