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
---
 backends/sdl/sdl-common.cpp | 6 +++---
 backends/sdl/sdl.cpp        | 6 +++---
 backends/sdl/sdl_gl.cpp     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'backends/sdl')

diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index cb4e49966f..ee28922e7e 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -150,7 +150,7 @@ void OSystem_SDL_Common::copy_rect(const byte *src, int pitch, int x, int y, int
 	if (_screen == NULL)
 		return;
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 	
 	if (((long)src & 3) == 0 && pitch == _screenWidth && x==0 && y==0 &&
 			w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) {
@@ -218,7 +218,7 @@ void OSystem_SDL_Common::move_screen(int dx, int dy, int height) {
 	if ((dx == 0 && dy == 0) || height <= 0)
 		return;
 	
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	byte *src, *dst;
 	int x, y;
@@ -1295,7 +1295,7 @@ void OSystem_SDL_Common::clear_overlay() {
 	if (!_overlayVisible)
 		return;
 	
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 	
 	// hide the mouse
 	undraw_mouse();
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index ad1c0d813c..93f8fb2a26 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -239,7 +239,7 @@ void OSystem_SDL::hotswap_gfx_mode() {
 void OSystem_SDL::update_screen() {
 	assert(_hwscreen != NULL);
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	// If the shake position changed, fill the dirty area with blackness
 	if (_currentShakePos != _newShakePos) {
@@ -369,7 +369,7 @@ void OSystem_SDL::update_screen() {
 
 uint32 OSystem_SDL::property(int param, Property *value) {
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	if (param == PROP_TOGGLE_FULLSCREEN) {
 		assert(_hwscreen != 0);
@@ -408,7 +408,7 @@ uint32 OSystem_SDL::property(int param, Property *value) {
 bool OSystem_SDL::save_screenshot(const char *filename) {
 	assert(_hwscreen != NULL);
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 	SDL_SaveBMP(_hwscreen, filename);
 	return true;
 }
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index 4fab4f0f5a..7177a9ceeb 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/backends/sdl/sdl_gl.cpp
@@ -359,7 +359,7 @@ void OSystem_SDL_OpenGL::hotswap_gfx_mode() {
 
 void OSystem_SDL_OpenGL::update_screen() {
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	// If the shake position changed, fill the dirty area with blackness
 	if (_currentShakePos != _newShakePos) {
@@ -563,7 +563,7 @@ bool OSystem_SDL_OpenGL::poll_event(Event *event) {
 
 uint32 OSystem_SDL_OpenGL::property(int param, Property *value) {
 
-	StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
 
 	if (param == PROP_TOGGLE_FULLSCREEN) {
 		if (!_usingOpenGL)
@@ -686,7 +686,7 @@ bool OSystem_SDL_OpenGL::save_screenshot(const char *filename) {
 	if (_usingOpenGL)
 		return false;
 
-	StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
 
 	assert(_hwscreen != NULL);
 	SDL_SaveBMP(_hwscreen, filename);
-- 
cgit v1.2.3