[Scummvm-cvs-logs] SF.net SVN: scummvm:[48074] scummvm/trunk/engines/gob/resources.cpp

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Wed Feb 17 00:18:32 CET 2010


Revision: 48074
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48074&view=rev
Author:   strangerke
Date:     2010-02-16 23:18:32 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Fascination - Fix syntax (clone2727)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/resources.cpp

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-02-16 23:15:57 UTC (rev 48073)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-02-16 23:18:32 UTC (rev 48074)
@@ -576,7 +576,7 @@
 // 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list