[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.210,2.211
Pawel Kolodziejski
aquadran at users.sourceforge.net
Wed Jun 4 22:05:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31212
Modified Files:
scummvm.cpp
Log Message:
fixed compilation for vc6
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.210
retrieving revision 2.211
diff -u -d -r2.210 -r2.211
--- scummvm.cpp 5 Jun 2003 02:44:18 -0000 2.210
+++ scummvm.cpp 5 Jun 2003 05:03:57 -0000 2.211
@@ -711,8 +711,7 @@
_audioNames = NULL;
}
-Scumm::~Scumm ()
-{
+Scumm::~Scumm () {
delete [] _actors;
delete _2byteFontPtr;
@@ -739,10 +738,9 @@
delete g_debugger;
}
-void Scumm::setFeatures (uint32 newFeatures)
-{
- bool newCostumes = _features & GF_NEW_COSTUMES;
- bool newNewCostumes = newFeatures & GF_NEW_COSTUMES;
+void Scumm::setFeatures (uint32 newFeatures) {
+ bool newCostumes = (_features & GF_NEW_COSTUMES) != 0;
+ bool newNewCostumes = (newFeatures & GF_NEW_COSTUMES) != 0;
_features = newFeatures;
More information about the Scummvm-git-logs
mailing list