From 302c825a1702a60f2af75af67090457477ea2bce Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Apr 2006 11:17:06 +0000
Subject: Reworked resource loading to no longer load hotspot proximities
 separately, or provide access to the list

svn-id: r22206
---
 engines/lure/res.cpp | 11 -----------
 engines/lure/res.h   |  5 -----
 2 files changed, 16 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index c14ec35655..8305dd28f8 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -254,17 +254,6 @@ void Resources::reloadData() {
 	}
 	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();	
diff --git a/engines/lure/res.h b/engines/lure/res.h
index 3d5a2abba4..79b766a06e 100644
--- a/engines/lure/res.h
+++ b/engines/lure/res.h
@@ -60,7 +60,6 @@ private:
 	SequenceDelayList _delayList;
 	Action _currentAction;
 	MemoryBlock *_talkDialogData;
-	HotspotProximityList _proximityList;
 	RoomExitCoordinatesList _coordinateList;
 
 	TalkData *_activeTalkData;
@@ -107,10 +106,6 @@ public:
 	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);
 
-- 
cgit v1.2.3