[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,NONE,2.1 actor.cpp,1.392,1.393 intern.h,2.542,2.543 module.mk,1.57,1.58 resource.cpp,1.350,1.351 resource_v7he.cpp,1.48,1.49 script_v100he.cpp,2.181,2.182 script_v72he.cpp,2.319,2.320 script_v7he.cpp,2.173,2.174 script_v80he.cpp,2.129,2.130 script_v90he.cpp,2.290,2.291 scumm.cpp,1.670,1.671 scumm.h,1.660,1.661 sound.cpp,1.492,1.493 sound.h,1.94,1.95 vars.cpp,1.156,1.157
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.493,1.494 sound_he.cpp,2.1,2.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,NONE,2.1 actor.cpp,1.392,1.393 intern.h,2.542,2.543 module.mk,1.57,1.58 resource.cpp,1.350,1.351 resource_v7he.cpp,1.48,1.49 script_v100he.cpp,2.181,2.182 script_v72he.cpp,2.319,2.320 script_v7he.cpp,2.173,2.174 script_v80he.cpp,2.129,2.130 script_v90he.cpp,2.290,2.291 scumm.cpp,1.670,1.671 scumm.h,1.660,1.661 sound.cpp,1.492,1.493 sound.h,1.94,1.95 vars.cpp,1.156,1.157
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.493,1.494 sound_he.cpp,2.1,2.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list