diff options
author | Eugene Sandulenko | 2011-08-05 17:56:04 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2011-08-06 11:30:44 +0100 |
commit | 4c7958450f628937270f259cc480c1191ea2fb2f (patch) | |
tree | f45dd9484dce1eb93bb8aaf144bb6c94b39e7855 /backends/timer/default/default-timer.cpp | |
parent | 0dafa7f80fbc271e599092e81655d8073ab91abe (diff) | |
download | scummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.tar.gz scummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.tar.bz2 scummvm-rg350-4c7958450f628937270f259cc480c1191ea2fb2f.zip |
TIMER: Implemented checks for duplicated timers
Diffstat (limited to 'backends/timer/default/default-timer.cpp')
-rw-r--r-- | backends/timer/default/default-timer.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index e17aaea444..449dda2ece 100644 --- a/backends/timer/default/default-timer.cpp +++ b/backends/timer/default/default-timer.cpp @@ -24,10 +24,10 @@ #include "common/util.h" #include "common/system.h" - struct TimerSlot { Common::TimerManager::TimerProc callback; void *refCon; + Common::String id; uint32 interval; // in microseconds uint32 nextFireTime; // in milliseconds @@ -113,9 +113,23 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v assert(interval > 0); Common::StackLock lock(_mutex); + if (_callbacks.contains(id)) { + if (_callbacks[id] != callback) { + error("Different callbacks are referred by same name (%s)", id.c_str()); + } + TimerSlotMap::const_iterator i; + + for (i = _callbacks.begin(); i != _callbacks.end(); ++i) { + if (i->_value == callback) { + error("Same callback is referred by different names (%s vs %s)", i->_key.c_str(), id.c_str()); + } + } + _callbacks[id] = callback; + TimerSlot *slot = new TimerSlot; slot->callback = callback; slot->refCon = refCon; + slot->id = id; slot->interval = interval; slot->nextFireTime = g_system->getMillis() + interval / 1000; slot->nextFireTimeMicro = interval % 1000; |