diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.cpp | 2 | ||||
| -rw-r--r-- | common/system.h | 20 | ||||
| -rw-r--r-- | common/timer.cpp | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/common/system.cpp b/common/system.cpp index bc65a5f21e..be85659eda 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -92,7 +92,7 @@ void OSystem::displayMessageOnOSD(const char *msg) { dialog.runModal(); } -SaveFileManager *OSystem::get_savefile_manager() { +SaveFileManager *OSystem::getSavefileManager() { return new DefaultSaveFileManager(); } diff --git a/common/system.h b/common/system.h index f3cad4f9b6..f962b9efe9 100644 --- a/common/system.h +++ b/common/system.h @@ -277,7 +277,7 @@ public: * frontend - we should consider removing it from the backend API * and instead implement the functionality in the frontend. */ - virtual void set_shake_pos(int shakeOffset) = 0; + virtual void setShakePos(int shakeOffset) = 0; //@} @@ -383,7 +383,7 @@ public: /** * Data structure for an event. A pointer to an instance of Event - * can be passed to poll_event. + * can be passed to pollEvent. */ struct Event { /** The type of the event. */ @@ -433,13 +433,13 @@ public: * @param event point to an Event struct, which will be filled with the event data. * @return true if an event was retrieved. */ - virtual bool poll_event(Event *event) = 0; + virtual bool pollEvent(Event &event) = 0; /** Get the number of milliseconds since the program was started. */ - virtual uint32 get_msecs() = 0; + virtual uint32 getMillis() = 0; /** Delay/sleep for the specified amount of milliseconds. */ - virtual void delay_msecs(uint msecs) = 0; + virtual void delayMillis(uint msecs) = 0; /** * Set the timer callback, a function which is periodically invoked by the @@ -558,7 +558,7 @@ public: * Poll CD status. * @return true if CD audio is playing */ - virtual bool poll_cdrom() = 0; + virtual bool pollCD() = 0; /** * Start audio CD playback. @@ -567,17 +567,17 @@ public: * @param start_frame the frame at which playback should start (75 frames = 1 second). * @param duration the number of frames to play. */ - virtual void play_cdrom(int track, int num_loops, int start_frame, int duration) = 0; + virtual void playCD(int track, int num_loops, int start_frame, int duration) = 0; /** * Stop audio CD playback. */ - virtual void stop_cdrom() = 0; + virtual void stopCD() = 0; /** * Update cdrom audio status. */ - virtual void update_cdrom() = 0; + virtual void updateCD() = 0; //@} @@ -609,7 +609,7 @@ public: virtual void displayMessageOnOSD(const char *msg); /** Savefile management. */ - virtual SaveFileManager *get_savefile_manager(); + virtual SaveFileManager *getSavefileManager(); //@} }; diff --git a/common/timer.cpp b/common/timer.cpp index f1e09a9ff0..d46d975dd3 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -43,7 +43,7 @@ Timer::Timer(OSystem *system) : _timerSlots[i].counter = 0; } - _thisTime = _system->get_msecs(); + _thisTime = _system->getMillis(); // Set the timer last, after everything has been initialised _system->setTimerCallback(&timer_handler, 10); @@ -79,7 +79,7 @@ int Timer::handler(int t) { uint32 interval, l; _lastTime = _thisTime; - _thisTime = _system->get_msecs(); + _thisTime = _system->getMillis(); interval = 1000 * (_thisTime - _lastTime); for (l = 0; l < MAX_TIMERS; l++) { |