diff options
author | Paul Gilbert | 2006-04-29 11:17:06 +0000 |
---|---|---|
committer | Paul Gilbert | 2006-04-29 11:17:06 +0000 |
commit | 302c825a1702a60f2af75af67090457477ea2bce (patch) | |
tree | 222653ac6f7809627de187124313b7686b968e3d | |
parent | 3e8763f454dc82d0e1969c39927fa6fdee3454f3 (diff) | |
download | scummvm-rg350-302c825a1702a60f2af75af67090457477ea2bce.tar.gz scummvm-rg350-302c825a1702a60f2af75af67090457477ea2bce.tar.bz2 scummvm-rg350-302c825a1702a60f2af75af67090457477ea2bce.zip |
Reworked resource loading to no longer load hotspot proximities separately, or provide access to the list
svn-id: r22206
-rw-r--r-- | engines/lure/res.cpp | 11 | ||||
-rw-r--r-- | engines/lure/res.h | 5 |
2 files changed, 0 insertions, 16 deletions
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); |