[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.193,1.194
Max Horn
fingolfin at users.sourceforge.net
Sun Sep 26 08:54:25 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.271,2.272 script_v72he.cpp,2.130,2.131 script_v80he.cpp,2.40,2.41 script_v90he.cpp,2.56,2.57 scumm.cpp,1.231,1.232 scumm.h,1.500,1.501
- Next message: [Scummvm-cvs-logs] CVS: scummvm COPYING,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.271,2.272 script_v72he.cpp,2.130,2.131 script_v80he.cpp,2.40,2.41 script_v90he.cpp,2.56,2.57 scumm.cpp,1.231,1.232 scumm.h,1.500,1.501
- Next message: [Scummvm-cvs-logs] CVS: scummvm COPYING,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list