diff options
| author | Max Horn | 2011-06-06 15:51:46 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-06 16:13:57 +0200 |
| commit | c81e94b25214d258e0789f51b0ad0236ba1bf9c0 (patch) | |
| tree | 41e1a0a9e9c121e58f1379db19d0faf743d80fcd /backends/platform/ps2 | |
| parent | 848079b66de84cec7559bfbd009d664098ea42ac (diff) | |
| download | scummvm-rg350-c81e94b25214d258e0789f51b0ad0236ba1bf9c0.tar.gz scummvm-rg350-c81e94b25214d258e0789f51b0ad0236ba1bf9c0.tar.bz2 scummvm-rg350-c81e94b25214d258e0789f51b0ad0236ba1bf9c0.zip | |
BACKENDS: Unify EventManager setup
Diffstat (limited to 'backends/platform/ps2')
| -rw-r--r-- | backends/platform/ps2/systemps2.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/ps2/systemps2.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index e3a2f77dc8..9336468b35 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -603,11 +603,7 @@ void OSystem_PS2::delayMillis(uint msecs) { Common::TimerManager *OSystem_PS2::getTimerManager() { return _scummTimerManager; } -/* -Common::EventManager *OSystem_PS2::getEventManager() { - return getEventManager(); -} -*/ + Audio::Mixer *OSystem_PS2::getMixer() { return _scummMixer; } diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 5e59a4f0c4..cc9c489827 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -94,7 +94,6 @@ public: virtual uint32 getMillis(); virtual void delayMillis(uint msecs); virtual Common::TimerManager *getTimerManager(); -// virtual Common::EventManager *getEventManager(); virtual bool pollEvent(Common::Event &event); virtual Audio::Mixer *getMixer(); |