From c81e94b25214d258e0789f51b0ad0236ba1bf9c0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:51:46 +0200 Subject: BACKENDS: Unify EventManager setup --- backends/platform/ps2/systemps2.cpp | 6 +----- backends/platform/ps2/systemps2.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'backends/platform/ps2') 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(); -- cgit v1.2.3