From d4734bd4f2963168f794691a618869ba4e558aaa Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 4 Oct 2003 11:50:21 +0000
Subject: 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
---
 common/timer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common/timer.cpp')

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++) {
-- 
cgit v1.2.3