aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-05-31 12:43:28 +0000
committerFilippos Karapetis2010-05-31 12:43:28 +0000
commitb5a2e3c758361e19518f934f99a69056319f5de4 (patch)
tree21951fc893b5d90297582f397c70e0c2ecf721a4
parent2bebba8c947ed6862a915d074804fc819ffd1472 (diff)
downloadscummvm-rg350-b5a2e3c758361e19518f934f99a69056319f5de4.tar.gz
scummvm-rg350-b5a2e3c758361e19518f934f99a69056319f5de4.tar.bz2
scummvm-rg350-b5a2e3c758361e19518f934f99a69056319f5de4.zip
Fixed operator precedence warning
svn-id: r49353
-rw-r--r--engines/sci/engine/vm.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index f18a3844eb..3aee20692a 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -594,10 +594,11 @@ static void callKernelFunc(EngineState *s, int kernelFuncNum, int argc) {
//warning("callk %s", kernelFunc.orig_name.c_str());
// TODO: SCI2.1 equivalent
- if (g_loadFromLauncher >= 0 &&
+ if (g_loadFromLauncher >= 0 && (
(kernelFuncNum == 0x8 && getSciVersion() <= SCI_VERSION_1_1) || // DrawPic
- (kernelFuncNum == 0x3d && getSciVersion() == SCI_VERSION_2)) { // GetSaveDir
- //(kernelFuncNum == 0x28 && getSciVersion() == SCI_VERSION_2_1)) { // AddPlane
+ (kernelFuncNum == 0x3d && getSciVersion() == SCI_VERSION_2) // GetSaveDir
+ //(kernelFuncNum == 0x28 && getSciVersion() == SCI_VERSION_2_1) // AddPlane
+ )) {
// A game is being loaded from the launcher, and the game is about to draw something on
// screen, hence all initialization has taken place (i.e. menus have been constructed etc).