diff options
| author | Max Horn | 2003-09-28 21:08:48 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-28 21:08:48 +0000 |
| commit | 17bf7b95aa8fb28dcacbe01a5ff547032ffbea1d (patch) | |
| tree | d45dcf601b6e3ef0983210144d869821a435c9c3 /common | |
| parent | 84ed3e272d7a470fac35e446ad9adbbd2c374f82 (diff) | |
| download | scummvm-rg350-17bf7b95aa8fb28dcacbe01a5ff547032ffbea1d.tar.gz scummvm-rg350-17bf7b95aa8fb28dcacbe01a5ff547032ffbea1d.tar.bz2 scummvm-rg350-17bf7b95aa8fb28dcacbe01a5ff547032ffbea1d.zip | |
removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)
svn-id: r10471
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.h | 3 | ||||
| -rw-r--r-- | common/timer.cpp | 2 | ||||
| -rw-r--r-- | common/timer.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/common/system.h b/common/system.h index 4da287e980..164316f71d 100644 --- a/common/system.h +++ b/common/system.h @@ -349,4 +349,7 @@ public: //@} }; +/** The global OSystem instance. Inited in main(). */ +extern OSystem *g_system; + #endif diff --git a/common/timer.cpp b/common/timer.cpp index 511d4f03e3..cc8bf00efc 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -25,7 +25,7 @@ #include "common/timer.h" #include "common/util.h" -static Timer *g_timer = NULL; +Timer *g_timer = NULL; Timer::Timer(OSystem *system) : _system(system), diff --git a/common/timer.h b/common/timer.h index 8299b193f7..5aaa7ccf96 100644 --- a/common/timer.h +++ b/common/timer.h @@ -60,6 +60,8 @@ protected: int handler(int t); }; +extern Timer *g_timer; + #endif #endif |