From 60e7faf9b6026d73ffb0709dfab44f734fdba332 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 25 Jul 2009 00:59:53 +0000 Subject: Replaced "_artificialEventQueue" by an EventSource. svn-id: r42722 --- backends/events/default/default-events.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'backends/events/default/default-events.cpp') diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 7e9d8db66e..799ac6ec14 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -380,8 +380,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { uint32 time = g_system->getMillis(); bool result; - if (!_artificialEventQueue.empty()) { - event = _artificialEventQueue.pop(); + if (_artificialEventSource.pollEvent(event)) { result = true; } else { result = _boss->pollEvent(event); @@ -599,9 +598,9 @@ void DefaultEventManager::pushEvent(const Common::Event &event) { // If already received an EVENT_QUIT, don't add another one if (event.type == Common::EVENT_QUIT) { if (!_shouldQuit) - _artificialEventQueue.push(event); + _artificialEventSource.addEvent(event); } else - _artificialEventQueue.push(event); + _artificialEventSource.addEvent(event); } #endif // !defined(DISABLE_DEFAULT_EVENTMANAGER) -- cgit v1.2.3