[Scummvm-cvs-logs] SF.net SVN: scummvm: [22852] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 22852
Author:   dreammaster
Date:     2006-06-02 20:38:24 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22852&view=rev

Log Message:
-----------
Bugfix to properly detect the end of the indexed room hotspot list

Modified Paths:
--------------
    scummvm/trunk/engines/lure/luredefs.h
    scummvm/trunk/engines/lure/res.cpp
Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h	2006-06-03 03:36:05 UTC (rev 22851)
+++ scummvm/trunk/engines/lure/luredefs.h	2006-06-03 03:38:24 UTC (rev 22852)
@@ -93,7 +93,7 @@
 
 #define SUPPORT_FILENAME "lure.dat"
 #define LURE_DAT_MAJOR 1
-#define LURE_DAT_MINOR 7
+#define LURE_DAT_MINOR 8
 
 // Some resources include multiple packed palettes of 64 entries each
 #define SUB_PALETTE_SIZE 64

Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2006-06-03 03:36:05 UTC (rev 22851)
+++ scummvm/trunk/engines/lure/res.cpp	2006-06-03 03:38:24 UTC (rev 22852)
@@ -292,7 +292,7 @@
 	// Load the list of room exit hotspot Ids
 	mb = d.getEntry(EXIT_HOTSPOT_ID_LIST);
 	RoomExitIndexedHotspotResource *indexedRec = (RoomExitIndexedHotspotResource *) mb->data();
-	while (indexedRec->roomNumber != 0) {
+	while (READ_LE_UINT16(indexedRec) != 0xffff) {
 		_indexedRoomExitHospots.push_back(new RoomExitIndexedHotspotData(indexedRec));
 		indexedRec++;
 	}


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