[Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.34,1.35 driver_tinygl.cpp,1.26,1.27 lua.cpp,1.149,1.150

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Aug 12 06:56:06 CEST 2005


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

Modified Files:
	bitmap.cpp driver_tinygl.cpp lua.cpp 
Log Message:
enabled DimRegion, fix display screenshot

Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- bitmap.cpp	10 Jul 2005 18:57:27 -0000	1.34
+++ bitmap.cpp	12 Aug 2005 13:51:09 -0000	1.35
@@ -90,6 +90,10 @@
 	_y = 0;
 	_width = width;
 	_height = height;
+	_format = 1;
+	_numTex = 0;
+	_texIds = NULL;
+	_hasTransparency = false;
 	_data = new char *[_numImages];
 	_data[0] = new char[2 * _width * _height];
 	memcpy(_data[0], data, 2 * _width * _height);

Index: driver_tinygl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- driver_tinygl.cpp	11 Aug 2005 13:49:49 -0000	1.26
+++ driver_tinygl.cpp	12 Aug 2005 13:51:09 -0000	1.27
@@ -479,7 +479,7 @@
 	int step = 0;
 	for (float y = 0; y < 479; y += step_y) {
 		for (float x = 0; x < 639; x += step_x) {
-			buffer[step++] = *(src + (int)y * 640 + (int)x); 
+			buffer[step++] = *(src + (int)y * 640 + (int)x);
 		}
 	}
 

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- lua.cpp	10 Aug 2005 05:30:58 -0000	1.149
+++ lua.cpp	12 Aug 2005 13:51:10 -0000	1.150
@@ -2876,7 +2876,13 @@
 static void DimScreen() {
 	DEBUG_FUNCTION();
 	if (debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
-		warning("DimScreen()");
+		warning("DimRegion()");
+}
+
+static void DimRegion() {
+	DEBUG_FUNCTION();
+	if (debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
+		warning("DimRegion()");
 }
 
 static void GetDiskFreeSpace() {
@@ -3326,7 +3332,6 @@
 STUB_FUNC(SetActorShadowPlane)
 STUB_FUNC(ActivateActorShadow)
 STUB_FUNC(SetShadowColor)
-STUB_FUNC(DimRegion)
 STUB_FUNC(ForceRefresh)
 STUB_FUNC(LightMgrStartup)
 STUB_FUNC(SetLightIntensity)





More information about the Scummvm-git-logs mailing list