aboutsummaryrefslogtreecommitdiff
path: root/engines/engine.h
diff options
context:
space:
mode:
authorMax Horn2008-12-25 20:53:59 +0000
committerMax Horn2008-12-25 20:53:59 +0000
commit6837416556cb84b0f84a1bc231be8d4d59e835bb (patch)
tree26f03a6d3ca2ce36358a2d3cb2a2aae13478405b /engines/engine.h
parentdf20d264fd300a26b15f46dfdfc2d9aa94810d5f (diff)
downloadscummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.tar.gz
scummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.tar.bz2
scummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.zip
Made Engine::_timer protected
svn-id: r35543
Diffstat (limited to 'engines/engine.h')
-rw-r--r--engines/engine.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/engine.h b/engines/engine.h
index e859cf090b..0a84a122da 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -71,9 +71,9 @@ class Engine {
public:
OSystem *_system;
Audio::Mixer *_mixer;
- Common::TimerManager * _timer;
protected:
+ Common::TimerManager *_timer;
Common::EventManager *_eventMan;
Common::SaveFileManager *_saveFileMan;
@@ -250,10 +250,9 @@ public:
*/
void openMainMenuDialog();
-
- Common::TimerManager *getTimerManager() { return _timer; }
- Common::EventManager *getEventManager() { return _eventMan; }
- Common::SaveFileManager *getSaveFileManager() { return _saveFileMan; }
+ inline Common::TimerManager *getTimerManager() { return _timer; }
+ inline Common::EventManager *getEventManager() { return _eventMan; }
+ inline Common::SaveFileManager *getSaveFileManager() { return _saveFileMan; }
public: