[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.193,1.194

[Max Horn]

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

Modified Files:
	object.cpp 
Log Message:
Use enums instead of hard coding assumptions about their values (i.e. 1 in this case)

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- object.cpp	26 Sep 2004 15:25:58 -0000	1.193
+++ object.cpp	26 Sep 2004 15:44:49 -0000	1.194
@@ -477,9 +477,9 @@
 	if (numstrip != 0) {
 		byte flags;
 		if (_version == 8) 
-			flags = (od.flag & 16) == 0;
+			flags = ((od.flag & 16) == 0) ? Gdi::dbAllowMaskOr : 0;
 		else if (_features & GF_HUMONGOUS)
-			flags = (od.flag & 1) != 0;
+			flags = ((od.flag & 1) != 0) ? Gdi::dbAllowMaskOr : 0;
 		else
 			flags = Gdi::dbAllowMaskOr;