thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)

Browse source 
svn-id: r10471
This commit is contained in:
Max Horn 2003-09-28 21:08:48 +00:00
parent 84ed3e272d
commit 17bf7b95aa
10 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/engine.cpp
View file

@ -29,7 +29,6 @@
#include "sound/mixer.h"
/* FIXME - BIG HACK for MidiEmu */
OSystem *g_system = 0;
Engine *g_engine = 0;
Engine::Engine(GameDetector *detector, OSystem *syst)
@ -39,9 +38,6 @@ Engine::Engine(GameDetector *detector, OSystem *syst)
_gameDataPath = detector->_gameDataPath;
g_system = _system; // FIXME - BIG HACK for MidiEmu
extern Timer *g_timer;
_timer = g_timer;
}