aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-06-05 05:03:57 +0000
committerPaweł Kołodziejski2003-06-05 05:03:57 +0000
commit1cbd8b55ed98df5ba8ad0900bc153509d3a5b69a (patch)
tree2876608cefda1202e19ec97d73990981c905530d
parent91a3d553e4aa9d31d73fa3607a659a2d33aa1a91 (diff)
downloadscummvm-rg350-1cbd8b55ed98df5ba8ad0900bc153509d3a5b69a.tar.gz
scummvm-rg350-1cbd8b55ed98df5ba8ad0900bc153509d3a5b69a.tar.bz2
scummvm-rg350-1cbd8b55ed98df5ba8ad0900bc153509d3a5b69a.zip
fixed compilation for vc6
svn-id: r8312
-rw-r--r--scumm/scummvm.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index a9b2f77d4d..c2b3b0ba2c 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -711,8 +711,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_audioNames = NULL;
}
-Scumm::~Scumm ()
-{
+Scumm::~Scumm () {
delete [] _actors;
delete _2byteFontPtr;
@@ -739,10 +738,9 @@ Scumm::~Scumm ()
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;