diff options
| author | Max Horn | 2003-08-05 23:58:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-05 23:58:24 +0000 |
| commit | 75db41750ef0ae4ad3d2b86f016fe21f67160fc4 (patch) | |
| tree | 9e74abef6ed60eede40e65adf55ecccc91cc50f4 /common | |
| parent | c431e229b3279bcb73de15dcdb32422b14162d65 (diff) | |
| download | scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.tar.gz scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.tar.bz2 scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.zip | |
getting rid of g_mixer; removing lots of whitespace
svn-id: r9527
Diffstat (limited to 'common')
| -rw-r--r-- | common/engine.cpp | 6 | ||||
| -rw-r--r-- | common/engine.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/common/engine.cpp b/common/engine.cpp index 25213b486f..90d73ed53a 100644 --- a/common/engine.cpp +++ b/common/engine.cpp @@ -73,7 +73,6 @@ const char *gScummVMFullVersion = "ScummVM 0.5.3cvs (" __DATE__ " " __TIME__ ")" /* FIXME - BIG HACK for MidiEmu */ OSystem *g_system = 0; -SoundMixer *g_mixer = 0; Engine *g_engine = 0; Engine::Engine(GameDetector *detector, OSystem *syst) @@ -83,9 +82,8 @@ Engine::Engine(GameDetector *detector, OSystem *syst) _gameDataPath = detector->_gameDataPath; - /* FIXME - BIG HACK for MidiEmu */ - g_system = _system; - g_mixer = _mixer; + g_system = _system; // FIXME - BIG HACK for MidiEmu + _timer = new Timer(this); } diff --git a/common/engine.h b/common/engine.h index 6731effd62..bed622bcf2 100644 --- a/common/engine.h +++ b/common/engine.h @@ -53,7 +53,6 @@ struct VersionSettings; /* FIXME - BIG HACK for MidiEmu */ extern OSystem *g_system; -extern SoundMixer *g_mixer; class Engine { public: |