diff options
author | Johannes Schickel | 2009-07-25 00:59:18 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-07-25 00:59:18 +0000 |
commit | 7905bbbc5b845854654d75a69876af87f78cdda0 (patch) | |
tree | d9526f55e595459de4fcd4399fec69316e5fc969 /backends/events | |
parent | ba7e01ad7c3a803471a6d0a1f91777fc16ed0096 (diff) | |
download | scummvm-rg350-7905bbbc5b845854654d75a69876af87f78cdda0.tar.gz scummvm-rg350-7905bbbc5b845854654d75a69876af87f78cdda0.tar.bz2 scummvm-rg350-7905bbbc5b845854654d75a69876af87f78cdda0.zip |
Got rid of EventManger::artificialEventQueue.
svn-id: r42719
Diffstat (limited to 'backends/events')
-rw-r--r-- | backends/events/default/default-events.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 4805321ac3..7e9d8db66e 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -219,9 +219,6 @@ DefaultEventManager::~DefaultEventManager() { g_system->unlockMutex(_timeMutex); g_system->unlockMutex(_recorderMutex); - if (!artificialEventQueue.empty()) - artificialEventQueue.clear(); - if (_playbackFile != NULL) { delete _playbackFile; } @@ -383,8 +380,8 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { uint32 time = g_system->getMillis(); bool result; - if (!artificialEventQueue.empty()) { - event = artificialEventQueue.pop(); + if (!_artificialEventQueue.empty()) { + event = _artificialEventQueue.pop(); result = true; } else { result = _boss->pollEvent(event); @@ -602,9 +599,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); + _artificialEventQueue.push(event); } else - artificialEventQueue.push(event); + _artificialEventQueue.push(event); } #endif // !defined(DISABLE_DEFAULT_EVENTMANAGER) |