[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.4,1.5 resource.cpp,1.4,1.5
Max Horn
fingolfin at users.sourceforge.net
Fri Aug 30 13:48:40 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.3,1.4 config.h,1.3,1.4 frenderer.cpp,1.4,1.5 imuse_channel.cpp,1.6,1.7 player.cpp,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sys.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv21918/scumm
Modified Files:
gfx.cpp resource.cpp
Log Message:
minor tweaks
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gfx.cpp 29 Aug 2002 20:01:25 -0000 1.4
+++ gfx.cpp 30 Aug 2002 20:47:47 -0000 1.5
@@ -239,6 +239,8 @@
void blit(byte *dst, byte *src, int w, int h)
{
assert(h > 0);
+ assert(src != NULL);
+ assert(dst != NULL);
do {
memcpy(dst, src, w);
@@ -539,6 +541,8 @@
}
}
+// Perform color cycling on the palManipulate data, too, otherwise
+// color cycling will be disturbed by the palette fade.
void Scumm::moveMemInPalRes(int start, int end, byte direction)
{
byte *startptr, *endptr;
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resource.cpp 29 Aug 2002 23:45:15 -0000 1.4
+++ resource.cpp 30 Aug 2002 20:47:48 -0000 1.5
@@ -764,7 +764,7 @@
CHECK_HEAP validateResource("getResourceAddress", type, idx);
if (!res.address[type]) {
- debug(1, "getResourceAddress(%s,%d), res.address[type] == NULL", resTypeFromId(type), idx);
+ debug(9, "getResourceAddress(%s,%d), res.address[type] == NULL", resTypeFromId(type), idx);
return NULL;
}
@@ -773,7 +773,7 @@
}
if (!(ptr = (byte *)res.address[type][idx])) {
- debug(1, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx);
+ debug(9, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx);
return NULL;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.3,1.4 config.h,1.3,1.4 frenderer.cpp,1.4,1.5 imuse_channel.cpp,1.6,1.7 player.cpp,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sys.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list