aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2006-06-24 09:34:49 +0000
committerMax Horn2006-06-24 09:34:49 +0000
commit75628fe9d7fa636da792d278b36396c3934ddf0e (patch)
tree2b206b49fcea8d913ddd0bc26347026242b1fce5 /base
parentff1566754407dea6b44e7687634850475aa2ccf2 (diff)
downloadscummvm-rg350-75628fe9d7fa636da792d278b36396c3934ddf0e.tar.gz
scummvm-rg350-75628fe9d7fa636da792d278b36396c3934ddf0e.tar.bz2
scummvm-rg350-75628fe9d7fa636da792d278b36396c3934ddf0e.zip
Renamed class Timer to TimerManager (the old name was somewhat incorrect/confusing)
svn-id: r23278
Diffstat (limited to 'base')
-rw-r--r--base/engine.h4
-rw-r--r--base/main.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/base/engine.h b/base/engine.h
index b9cc17a29c..e4055edb22 100644
--- a/base/engine.h
+++ b/base/engine.h
@@ -32,14 +32,14 @@ namespace Audio {
}
namespace Common {
class SaveFileManager;
- class Timer;
+ class TimerManager;
}
class Engine {
public:
OSystem *_system;
Audio::Mixer *_mixer;
- Common::Timer * _timer;
+ Common::TimerManager * _timer;
protected:
const Common::String _targetName; // target name for saves
diff --git a/base/main.cpp b/base/main.cpp
index 7c5042eb15..e65b589750 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -317,7 +317,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
system.initBackend();
// Create the timer services
- Common::g_timer = new Common::Timer(&system);
+ Common::g_timer = new Common::TimerManager(&system);
// Set initial window caption
system.setWindowCaption(gScummVMFullVersion);