[Scummvm-cvs-logs] CVS: residual driver_tinygl.cpp,1.33,1.34 scene.cpp,1.48,1.49

Marcus Comstedt marcus_c at users.sourceforge.net
Sun Feb 5 08:15:06 CET 2006


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3231

Modified Files:
	driver_tinygl.cpp scene.cpp 
Log Message:
Moved check against TGL_MAX_LIGHTS into driver_tinygl.cpp, as it is specific to TinyGL.

Index: driver_tinygl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- driver_tinygl.cpp	5 Jan 2006 02:40:26 -0000	1.33
+++ driver_tinygl.cpp	5 Feb 2006 16:14:19 -0000	1.34
@@ -239,6 +239,7 @@
 }
 
 void DriverTinyGL::setupLight(Scene::Light *light, int lightId) {
+	assert(lightId < TGL_MAX_LIGHTS);
 	tglEnable(TGL_LIGHTING);
 	float ambientLight[] = { 0.2f, 0.2f, 0.2f, 1.0f };
 	float diffuseLight[] = { 0.5f, 0.5f, 0.5f, 1.0f };

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- scene.cpp	5 Feb 2006 16:11:11 -0000	1.48
+++ scene.cpp	5 Feb 2006 16:14:19 -0000	1.49
@@ -198,7 +198,6 @@
 	}
 
 	for (int i = 0; i < _numLights; i++) {
-		assert(i < TGL_MAX_LIGHTS);
 		g_driver->setupLight(&_lights[i], i);
 	}
 }





More information about the Scummvm-git-logs mailing list