From 2fa7fbc1a53b7f158dfe9c70395d1b8a2cd442d1 Mon Sep 17 00:00:00 2001
From: Scott Thomas <scott_t@users.sourceforge.net>
Date: Thu, 1 Oct 2009 15:58:15 +0000
Subject: [PATCH] T7G: Proper fix for #2847539 - remove ambiguity in multi-byte
 script reads.

svn-id: r44524
---
 engines/groovie/script.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 6b2a0c31765..3c6734fc392 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -264,11 +264,15 @@ uint8 Script::readScriptVar() {
 }
 
 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() {