[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.190,1.191

Max Horn fingolfin at users.sourceforge.net
Sun Sep 26 07:13:31 CEST 2004


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

Modified Files:
	object.cpp 
Log Message:
flag computation makes no sense; the whole thing looks quirky :-/

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- object.cpp	26 Sep 2004 09:13:02 -0000	1.190
+++ object.cpp	26 Sep 2004 14:07:53 -0000	1.191
@@ -477,12 +477,15 @@
 	if (numstrip != 0) {
 		byte flags;
 		if (_version == 8) 
+			// TODO: This makes no sense, Kirben: flag bit 4 (16 = 2^4) isn't used;
+			// even if it was, it'd probably mean something different for us than for
+			// COMI. Maybe you mean: "flags = (od.flag & 16) != 0;" ?
 			flags = (od.flag & 16);
 		else if (_features & GF_HUMONGOUS)
-			//TODO Should be read from object header
+			// TODO: Should be read from object header
 			flags = 0;
 		else
-			flags = Gdi::dbAllowMaskOr;;
+			flags = Gdi::dbAllowMaskOr;
 
 		if (_version == 1) {
 			gdi._C64ObjectMode = true;





More information about the Scummvm-git-logs mailing list