[Scummvm-cvs-logs] CVS: residual costume.cpp,1.37,1.38 lua.cpp,1.164,1.165

Erich Edgar Hoover compholio at users.sourceforge.net
Wed Jan 4 23:39:02 CET 2006


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

Modified Files:
	costume.cpp lua.cpp 
Log Message:
Fix change colormap on null costume, fix PrintDebug line terminator

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- costume.cpp	5 Jan 2006 02:40:26 -0000	1.37
+++ costume.cpp	5 Jan 2006 07:38:09 -0000	1.38
@@ -931,7 +931,9 @@
 }
 
 void Costume::setColormap(char *map) {
-	if (map == NULL)
+	// Sometimes setColormap is called on a null costume,
+	// see where raoul is gone in hh.set
+	if (this == NULL || map == NULL)
 		return;
 	_cmap = g_resourceloader->loadColormap(map);
 	for (int i = 0; i < _numComponents; i++)

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- lua.cpp	26 Dec 2005 19:26:46 -0000	1.164
+++ lua.cpp	5 Jan 2006 07:38:09 -0000	1.165
@@ -216,8 +216,8 @@
 		std::string msg = luaL_check_string(1);
 		
 		msg.insert(0, "Debug: ");
-		std::fputs(msg.c_str(), stderr);
 		msg.append("\n");
+		std::fputs(msg.c_str(), stderr);
 	}
 }
 





More information about the Scummvm-git-logs mailing list