From b6c92b90b6bed242bbea8521615ca971c81171ca Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Sat, 24 Apr 2010 14:10:52 +0000
Subject: SCI: Fix regression in locals init for re-used segments

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

(limited to 'engines/sci')

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index b09462e70c..98fc47e2c0 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -167,7 +167,11 @@ void SegManager::scriptInitialiseLocalsZero(SegmentId seg, int count) {
 
 	scr->_localsOffset = -count * 2; // Make sure it's invalid
 
-	allocLocalsSegment(scr, count);
+	LocalVariables *locals = allocLocalsSegment(scr, count);
+	if (locals) {
+		for (int i = 0; i < count; i++)
+			locals->_locals[i] = NULL_REG;
+	}
 }
 
 void SegManager::scriptInitialiseLocals(reg_t location) {
@@ -195,7 +199,7 @@ void SegManager::scriptInitialiseLocals(reg_t location) {
 		byte *base = (byte *)(scr->_buf + location.offset);
 
 		for (i = 0; i < count; i++)
-			locals->_locals[i].offset = READ_LE_UINT16(base + i * 2);
+			locals->_locals[i] = make_reg(0, READ_LE_UINT16(base + i * 2));
 	}
 }
 
-- 
cgit v1.2.3