[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.91,1.92 sdl.cpp,1.51,1.52 sdl_gl.cpp,1.58,1.59

Max Horn fingolfin at users.sourceforge.net
Sat Oct 4 04:51:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv25712/backends/sdl

Modified Files:
	sdl-common.cpp sdl.cpp sdl_gl.cpp 
Log Message:
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- sdl-common.cpp	3 Oct 2003 00:30:56 -0000	1.91
+++ sdl-common.cpp	4 Oct 2003 11:50:20 -0000	1.92
@@ -150,7 +150,7 @@
 	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 @@
 	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 @@
 	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();

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sdl.cpp	4 Oct 2003 00:12:30 -0000	1.51
+++ sdl.cpp	4 Oct 2003 11:50:20 -0000	1.52
@@ -239,7 +239,7 @@
 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 @@
 
 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 @@
 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;
 }

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sdl_gl.cpp	27 Sep 2003 21:19:27 -0000	1.58
+++ sdl_gl.cpp	4 Oct 2003 11:50:20 -0000	1.59
@@ -359,7 +359,7 @@
 
 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 @@
 
 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 @@
 	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);





More information about the Scummvm-git-logs mailing list