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

[dreammaster at users.sourceforge.net]

Revision: 22206
Author:   dreammaster
Date:     2006-04-29 04:17:06 -0700 (Sat, 29 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22206&view=rev

Log Message:
-----------
Reworked resource loading to no longer load hotspot proximities separately, or provide access to the list

Modified Paths:
--------------
    scummvm/trunk/engines/lure/res.cpp
    scummvm/trunk/engines/lure/res.h
Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2006-04-29 11:15:03 UTC (rev 22205)
+++ scummvm/trunk/engines/lure/res.cpp	2006-04-29 11:17:06 UTC (rev 22206)
@@ -254,17 +254,6 @@
 	}
 	delete mb;
 
-	// Load a list of hotspot proximities
-	mb = d.getEntry(HOTSPOT_PROXIMITY_RESOURCE_ID);
-	HotspotProximityResource *proxRec = (HotspotProximityResource *) mb->data();
-	while (FROM_LE_16(proxRec->hotspotId) != 0xffff) {
-		HotspotProximityData *newEntry = new HotspotProximityData(proxRec);
-		_proximityList.push_back(newEntry);
-		++joinRec;
-		++proxRec;
-	}
-	delete mb;
-
 	// Load in the list of room exit coordinates
 	mb = d.getEntry(EXIT_COORDINATES_RESOURCE_ID);
 	RoomExitCoordinateEntryResource *coordRec = (RoomExitCoordinateEntryResource *) mb->data();	

Modified: scummvm/trunk/engines/lure/res.h
===================================================================
--- scummvm/trunk/engines/lure/res.h	2006-04-29 11:15:03 UTC (rev 22205)
+++ scummvm/trunk/engines/lure/res.h	2006-04-29 11:17:06 UTC (rev 22206)
@@ -60,7 +60,6 @@
 	SequenceDelayList _delayList;
 	Action _currentAction;
 	MemoryBlock *_talkDialogData;
-	HotspotProximityList _proximityList;
 	RoomExitCoordinatesList _coordinateList;
 
 	TalkData *_activeTalkData;
@@ -107,10 +106,6 @@
 	ValueTableData &fieldList() { return _fieldList; }
 	SequenceDelayList &delayList() { return _delayList; }
 	MemoryBlock &getTalkDialogData() { return *_talkDialogData; }
-	HotspotProximityList &proximityList() { return _proximityList; }
-	HotspotProximityData *getHotspotProximity(uint16 hotspotId) { 
-		return _proximityList.getHotspot(hotspotId);
-	}
 	RoomExitCoordinatesList &coordinateList() { return _coordinateList; }
 	void copyCursorTo(Surface *s, uint8 cursorNum, int16 x, int16 y);
 


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