diff options
| author | Max Horn | 2003-10-04 11:50:21 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-04 11:50:21 +0000 |
| commit | d4734bd4f2963168f794691a618869ba4e558aaa (patch) | |
| tree | 6881cb61298534a4966533289bb81a2f0332a4c3 /common/timer.cpp | |
| parent | 91da08e1f3f836442c9c2ff39a9d1570f49df24d (diff) | |
| download | scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.gz scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.bz2 scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.zip | |
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
svn-id: r10592
Diffstat (limited to 'common/timer.cpp')
| -rw-r--r-- | common/timer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/timer.cpp b/common/timer.cpp index cc8bf00efc..c6a139bd54 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -54,7 +54,7 @@ Timer::~Timer() { _system->set_timer(0, 0); { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); for (int i = 0; i < MAX_TIMERS; i++) { _timerSlots[i].procedure = NULL; _timerSlots[i].interval = 0; @@ -81,7 +81,7 @@ int Timer::timer_handler(int t) { } int Timer::handler(int t) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); uint32 interval, l; _lastTime = _thisTime; @@ -102,7 +102,7 @@ int Timer::handler(int t) { } bool Timer::installProcedure(TimerProc procedure, int32 interval, void *refCon) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); int32 l; bool found = false; @@ -124,7 +124,7 @@ bool Timer::installProcedure(TimerProc procedure, int32 interval, void *refCon) } void Timer::releaseProcedure(TimerProc procedure) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); int32 l; for (l = 0; l < MAX_TIMERS; l++) { |