From ca7c35bc9a87a28cc34bbbba430f5b50ebab9463 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 29 Jul 2009 15:57:50 +0000
Subject: Oops, fixing a regression I created with the Map_v4/Map_v2-merge

svn-id: r42894
---
 engines/gob/map_v2.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index a13cd96249..51caad74b8 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.cpp
@@ -79,9 +79,11 @@ void Map_v2::loadMapObjects(const char *avjFile) {
 		_screenWidth = 640;
 		_screenHeight = 400;
 	} else if (_widthByte == 3) {
+		_passWidth = 65;
 		_screenWidth = 640;
 		_screenHeight = 200;
 	} else {
+		_passWidth = 40;
 		_screenWidth = 320;
 		_screenHeight = 200;
 	}
@@ -117,10 +119,10 @@ void Map_v2::loadMapObjects(const char *avjFile) {
 		_wayPoints[i].notWalkable = mapData.readSByte();
 	}
 
-	if (_widthByte == 4)
-		_mapWidth = VAR(17);
-
-	_passWidth = _mapWidth;
+	if (_widthByte == 4) {
+		_mapWidth  = VAR(17);
+		_passWidth = _mapWidth;
+	}
 
 	// In the original asm, this writes byte-wise into the variables-array
 	tmpPos = mapData.pos();
-- 
cgit v1.2.3