[Scummvm-cvs-logs] SF.net SVN: scummvm:[42894] scummvm/trunk/engines/gob/map_v2.cpp

[drmccoy at users.sourceforge.net]

Revision: 42894
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42894&view=rev
Author:   drmccoy
Date:     2009-07-29 15:57:50 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Oops, fixing a regression I created with the Map_v4/Map_v2-merge

Modified Paths:
--------------
    scummvm/trunk/engines/gob/map_v2.cpp

Modified: scummvm/trunk/engines/gob/map_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/map_v2.cpp	2009-07-29 15:33:38 UTC (rev 42893)
+++ scummvm/trunk/engines/gob/map_v2.cpp	2009-07-29 15:57:50 UTC (rev 42894)
@@ -79,9 +79,11 @@
 		_screenWidth = 640;
 		_screenHeight = 400;
 	} else if (_widthByte == 3) {
+		_passWidth = 65;
 		_screenWidth = 640;
 		_screenHeight = 200;
 	} else {
+		_passWidth = 40;
 		_screenWidth = 320;
 		_screenHeight = 200;
 	}
@@ -117,11 +119,11 @@
 		_wayPoints[i].notWalkable = mapData.readSByte();
 	}
 
-	if (_widthByte == 4)
-		_mapWidth = VAR(17);
+	if (_widthByte == 4) {
+		_mapWidth  = VAR(17);
+		_passWidth = _mapWidth;
+	}
 
-	_passWidth = _mapWidth;
-
 	// In the original asm, this writes byte-wise into the variables-array
 	tmpPos = mapData.pos();
 	mapData.seek(passPos);


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