aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-01-15 14:12:45 +0100
committerJohannes Schickel2012-01-15 14:12:45 +0100
commitcdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3 (patch)
treee702352e26f477e647eaf1573fe9a74d933d88a6
parentea275d2cdad5d776271ecba81d16f86447a7e953 (diff)
downloadscummvm-rg350-cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3.tar.gz
scummvm-rg350-cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3.tar.bz2
scummvm-rg350-cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3.zip
TSAGE: Don't use "&&" synonym "and".
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 45aec17fbf..aa2a0d9c44 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2237,7 +2237,7 @@ void Scene1550::UnkArea1550::remove() {
SceneArea::remove();
R2_GLOBALS._insetUp--;
//
- if ((scene->_sceneMode >= 20) and (scene->_sceneMode <= 29))
+ if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
return;
R2_GLOBALS._player.disableControl();