aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2019-12-25 12:38:26 +0000
committerD G Turner2019-12-25 12:38:26 +0000
commitfa5c023a1fccda7222cd8c2edbe70a1155a996ba (patch)
treebcca0c0b9bbab76f716e384f470dcf54c52a3867 /engines
parentf491a2562c396177349a1a3b232d0c37754476f8 (diff)
downloadscummvm-rg350-fa5c023a1fccda7222cd8c2edbe70a1155a996ba.tar.gz
scummvm-rg350-fa5c023a1fccda7222cd8c2edbe70a1155a996ba.tar.bz2
scummvm-rg350-fa5c023a1fccda7222cd8c2edbe70a1155a996ba.zip
KYRA: Remove GCC -Wlogical-op Compiler Warning
This piece of code is not functional as the test will always evaluate to false so hiding this with a preprocessor guard will not cause any functional change. It is now clearly marked with FIXME and TODO along with a comment for future reference.
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/sequence/sequences_lok.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index b50b6c9dfe..ba3d49fafa 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -789,9 +789,12 @@ void KyraEngine_LoK::seq_dispelMagicAnimation() {
}
_screen->hideMouse();
// TODO
- // This condition is always false. Is this a typo or a bug in the original?
- if (_currentCharacter->sceneId == 210 && _currentCharacter->sceneId < 160)
+#if 0
+ // FIXME: This condition is always false. Is this a typo or a bug in the original?
+ if (_currentCharacter->sceneId == 210 && _currentCharacter->sceneId < 160) {
_currentCharacter->facing = 3;
+ }
+#endif
if (_malcolmFlag == 7 && _beadStateVar == 3) {
_beadStateVar = 6;
_unkEndSeqVar5 = 2;