[Scummvm-cvs-logs] SF.net SVN: scummvm:[50237] scummvm/trunk/engines/sci/engine/seg_manager. cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50237
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50237&view=rev
Author:   m_kiewitz
Date:     2010-06-24 21:46:57 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
SCI: doing the exact opposite of r50236 code-wise now, as it was meant to be

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-06-24 21:42:08 UTC (rev 50236)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-06-24 21:46:57 UTC (rev 50237)
@@ -616,7 +616,7 @@
 	//  we can safely ignore this, if it isn't one of the first 2 chars.
 	//  foreign lsl3 uses kFileIO(readraw) and then immediately uses kReadNumber right at the start
 	if (val.segment != 0)
-		if ((offset > 1) && val.segment == 0xFFFF)
+		if (!((val.segment == 0xFFFF) && (offset > 1)))
 			warning("Attempt to read character from non-raw data");
 
 	return (offset & 1 ? val.offset >> 8 : val.offset & 0xff);


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