aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Boutonné2010-02-16 23:18:32 +0000
committerArnaud Boutonné2010-02-16 23:18:32 +0000
commit85bce4611c94c0bad9fcb06e868fe3441a54e636 (patch)
tree86e58f23ea4f2ba63e032aa0067aaf3bba6ad090
parentbe9a0946b4fac97be41d93366a9b28f9ed7e709b (diff)
downloadscummvm-rg350-85bce4611c94c0bad9fcb06e868fe3441a54e636.tar.gz
scummvm-rg350-85bce4611c94c0bad9fcb06e868fe3441a54e636.tar.bz2
scummvm-rg350-85bce4611c94c0bad9fcb06e868fe3441a54e636.zip
Fascination - Fix syntax (clone2727)
svn-id: r48074
-rw-r--r--engines/gob/resources.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/gob/resources.cpp b/engines/gob/resources.cpp
index e36262f8d3..6acaf224f8 100644
--- a/engines/gob/resources.cpp
+++ b/engines/gob/resources.cpp
@@ -576,7 +576,7 @@ TextItem *Resources::getTextItem(uint16 id) const {
// HACK: Some Fascination versions (Amiga, Atari and first PC floppies) have a different header, which is a problem here.
// Playtoons also have the same problem (and workaround).
// TODO: Handle that in a proper way
- if (((_vm->getGameType() == kGameTypeFascination) | (_vm->getGameType() == kGameTypePlaytoons)) & (_totTextTable->size < 0))
+ if (((_vm->getGameType() == kGameTypeFascination) || (_vm->getGameType() == kGameTypePlaytoons)) && (_totTextTable->size < 0))
warning("totTextTable with negative size id:%d offset:%d in file %s : (size: %d)", id, totItem.offset, _totFile.c_str(), _totTextTable->size);
else
return 0;