[Scummvm-cvs-logs] SF.net SVN: scummvm:[44529] scummvm/branches/branch-1-0-0/engines/groovie/ script.cpp

[scott_t at users.sourceforge.net]

Revision: 44529
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44529&view=rev
Author:   scott_t
Date:     2009-10-02 00:19:03 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Backport r44524: T7G: Remove ambiguity from multi-byte script reads

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/groovie/script.cpp

Modified: scummvm/branches/branch-1-0-0/engines/groovie/script.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/script.cpp	2009-10-01 17:30:10 UTC (rev 44528)
+++ scummvm/branches/branch-1-0-0/engines/groovie/script.cpp	2009-10-02 00:19:03 UTC (rev 44529)
@@ -265,11 +265,15 @@
 }
 
 uint16 Script::readScript16bits() {
-	return readScript8bits() | (readScript8bits() << 8);
+	uint8 lower = readScript8bits();
+	uint8 upper = readScript8bits();
+	return lower | (upper << 8);
 }
 
 uint32 Script::readScript32bits() {
-	return readScript16bits() | (readScript16bits() << 16);
+	uint16 lower = readScript16bits();
+	uint16 upper = readScript16bits();
+	return lower | (upper << 16);
 }
 
 uint16 Script::readScript8or16bits() {


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