[Scummvm-cvs-logs] SF.net SVN: scummvm:[40701] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 40701
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40701&view=rev
Author:   athrxx
Date:     2009-05-18 20:28:08 +0000 (Mon, 18 May 2009)

Log Message:
-----------
LOL: fixed automap

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-05-18 20:08:18 UTC (rev 40700)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-05-18 20:28:08 UTC (rev 40701)
@@ -3370,7 +3370,7 @@
 	_screen->fadePalette(_screen->getPalette(3), 10);
 	_smoothScrollTimer = _system->getMillis() + 8 * _tickLength;
 
-	while (!exitAutomap) {
+	while (!exitAutomap && !shouldQuit()) {
 		if (_mapUpdateNeeded) {
 			drawMapPage(2);
 			_screen->copyPage(2, 0);
@@ -3660,10 +3660,8 @@
 	if (i == _currentMapLevel)
 		return;
 
-	for (int l = 0; l < 11; l++) {
+	for (int l = 0; l < 11; l++)
 		_defaultLegendData[l].enable = false;
-		_defaultLegendData[l].shapeIndex = 255;
-	}
 
 	_currentMapLevel = i;
 	loadLevelWallData(i, false);
@@ -3679,10 +3677,8 @@
 	if (i == _currentMapLevel)
 		return;
 
-	for (int l = 0; l < 11; l++) {
+	for (int l = 0; l < 11; l++)
 		_defaultLegendData[l].enable = false;
-		_defaultLegendData[l].shapeIndex = 255;
-	}
 
 	_currentMapLevel = i;
 	loadLevelWallData(i, false);

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-05-18 20:08:18 UTC (rev 40700)
+++ scummvm/trunk/engines/kyra/lol.h	2009-05-18 20:28:08 UTC (rev 40701)
@@ -256,7 +256,7 @@
 struct MapLegendData {
 	uint8 shapeIndex;
 	bool enable;
-	uint8 x;
+	int8 x;
 	uint16 stringId;
 };
 

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-05-18 20:08:18 UTC (rev 40700)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-05-18 20:28:08 UTC (rev 40701)
@@ -1844,7 +1844,7 @@
 	for (int i = 0; i < tmpSize; i++) {
 		_defaultLegendData[i].shapeIndex = *tmp++;
 		_defaultLegendData[i].enable = *tmp++ ? true : false;
-		_defaultLegendData[i].x = *tmp++;
+		_defaultLegendData[i].x = (int8)*tmp++;
 		_defaultLegendData[i].stringId = READ_LE_UINT16(tmp);
 		tmp += 2;
 	}


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