From 220d6ce82f478966db6a4760b2288750212880b9 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 8 May 2008 00:47:23 +0000
Subject: Restructured sound code

svn-id: r31937
---
 engines/gob/map_v2.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/gob/map_v2.cpp')

diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index 2c383f5bb2..668b4d2e97 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-
 #include "common/stream.h"
 
 #include "gob/gob.h"
-- 
cgit v1.2.3


From 8da68b29648f9dbdcc05b3a1efe4a29ed2c4e88c Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 28 May 2008 21:15:11 +0000
Subject: Script variables are now always stored in the game version's native
 endianess. This should make Woodruff playable on big-endian systems.

svn-id: r32352
---
 engines/gob/map_v2.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'engines/gob/map_v2.cpp')

diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index 668b4d2e97..bd9f5b3efc 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.cpp
@@ -56,12 +56,12 @@ void Map_v2::loadMapObjects(const char *avjFile) {
 	uint32 passPos;
 
 	var = _vm->_parse->parseVarIndex();
-	variables = _vm->_global->_inter_variables + var;
+	variables = _vm->_inter->_variables->getAddressOff8(var, 0);
 
 	id = _vm->_inter->load16();
 
 	if (id == -1) {
-		_passMap = (int8 *)(_vm->_global->_inter_variables + var);
+		_passMap = (int8 *) _vm->_inter->_variables->getAddressOff8(var, 0);
 		return;
 	}
 
@@ -104,18 +104,17 @@ void Map_v2::loadMapObjects(const char *avjFile) {
 	// In the original asm, this writes byte-wise into the variables-array
 	tmpPos = mapData.pos();
 	mapData.seek(passPos);
-	if (variables != _vm->_global->_inter_variables) {
-		byte *sizes;
+	if ((variables != 0) &&
+	    (variables != _vm->_inter->_variables->getAddressOff8(0, 0))) {
 
 		_passMap = (int8 *) variables;
 		mapHeight = _screenHeight / _tilesHeight;
 		mapWidth = _screenWidth / _tilesWidth;
-		sizes = _vm->_global->_inter_variablesSizes +
-			(((byte *) _passMap) - _vm->_global->_inter_variables);
+
 		for (int i = 0; i < mapHeight; i++) {
 			for (int j = 0; j < mapWidth; j++)
 				setPass(j, i, mapData.readSByte());
-			memset(sizes + i * _passWidth, 0, mapWidth);
+			_vm->_inter->_variables->getAddressOff8(var + i * _passWidth, mapWidth);
 		}
 	}
 	mapData.seek(tmpPos);
-- 
cgit v1.2.3