[Scummvm-cvs-logs] SF.net SVN: scummvm: [20764] scummvm/trunk/engines/lure
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sat Feb 18 20:19:01 CET 2006
Revision: 20764
Author: dreammaster
Date: 2006-02-18 20:17:54 -0800 (Sat, 18 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20764&view=rev
Log Message:
-----------
Added handling for conversation data, as well as moved storing cursor data into it
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-02-19 04:15:33 UTC (rev 20763)
+++ scummvm/trunk/engines/lure/res.cpp 2006-02-19 04:17:54 UTC (rev 20764)
@@ -57,6 +57,7 @@
delete _script2Data;
delete _hotspotScriptData;
delete _messagesData;
+ delete _cursors;
}
struct AnimRecordTemp {
@@ -68,6 +69,7 @@
Disk &d = Disk::getReference();
MemoryBlock *mb;
uint16 *offset, offsetVal;
+ uint16 recordId;
int ctr;
// Get the palette subset data
@@ -107,7 +109,7 @@
if (offsetVal != 0) {
RoomData *room = getRoom(ctr);
if (room) {
- RoomExitHotspotRecord *re = (RoomExitHotspotRecord *)
+ RoomExitHotspotResource *re = (RoomExitHotspotResource *)
(mb->data() + offsetVal);
while (READ_LE_UINT16(&re->hotspotId) != 0xffff) {
RoomExitHotspotData *newEntry = new RoomExitHotspotData(re);
@@ -122,7 +124,7 @@
// Load room joins
mb = d.getEntry(ROOM_EXIT_JOINS_RESOURCE_ID);
- RoomExitJoinRecord *joinRec = (RoomExitJoinRecord *) mb->data();
+ RoomExitJoinResource *joinRec = (RoomExitJoinResource *) mb->data();
while (READ_LE_UINT16(&joinRec->hotspot1Id) != 0xffff) {
RoomExitJoinData *newEntry = new RoomExitJoinData(joinRec);
_exitJoins.push_back(newEntry);
@@ -194,7 +196,6 @@
// Handle the hotspot action lists
mb = d.getEntry(ACTION_LIST_RESOURCE_ID);
uint16 *v = (uint16 *) mb->data();
- uint16 recordId;
while ((recordId = READ_LE_UINT16(v)) != 0xffff) {
++v;
offsetVal = READ_LE_UINT16(v);
@@ -206,12 +207,62 @@
}
delete mb;
+ // Read in the talk data header
+ mb = d.getEntry(TALK_HEADER_RESOURCE_ID);
+ TalkHeaderResource *thHeader = (TalkHeaderResource *) mb->data();
+ uint16 hotspotId;
+ while ((hotspotId = FROM_LE_16(thHeader->hotspotId)) != 0xffff) {
+ uint16 *offsets = (uint16 *) (mb->data() + FROM_LE_16(thHeader->offset));
+ TalkHeaderData *newEntry = new TalkHeaderData(hotspotId, offsets);
+
+ _talkHeaders.push_back(newEntry);
+ ++thHeader;
+ }
+ delete mb;
+
+ // Read in the talk data entries
+ mb = d.getEntry(TALK_DATA_RESOURCE_ID);
+ TalkDataHeaderResource *tdHeader = (TalkDataHeaderResource *) mb->data();
+
+ while ((recordId = FROM_LE_16(tdHeader->recordId)) != 0xffff) {
+ TalkData *data = new TalkData(recordId);
+
+ TalkDataResource *entry = (TalkDataResource *) (mb->data() +
+ FROM_LE_16(tdHeader->listOffset));
+ while (FROM_LE_16(entry->preSequenceId) != 0xffff) {
+ TalkEntryData *newEntry = new TalkEntryData(entry);
+ data->entries.push_back(newEntry);
+ ++entry;
+ }
+
+ entry = (TalkDataResource *) (mb->data() +
+ FROM_LE_16(tdHeader->responsesOffset));
+ while (FROM_LE_16(entry->preSequenceId) != 0xffff) {
+ TalkEntryData *newEntry = new TalkEntryData(entry);
+ data->responses.push_back(newEntry);
+ ++entry;
+ }
+
+ _talkData.push_back(data);
+ ++tdHeader;
+ }
+ delete mb;
+
+ // Initialise delay list
_delayList.clear();
// Load miscellaneous data
+ _cursors = d.getEntry(CURSOR_RESOURCE_ID);
_scriptData = d.getEntry(SCRIPT_DATA_RESOURCE_ID);
_script2Data = d.getEntry(SCRIPT2_DATA_RESOURCE_ID);
_messagesData = d.getEntry(MESSAGES_LIST_RESOURCE_ID);
+ _talkDialogData = d.getEntry(TALK_DIALOG_RESOURCE_ID);
+
+ _activeTalkData = NULL;
+ _currentAction = NONE;
+ _talkState = TALK_NONE;
+ _talkSelection = 0;
+ _talkStartEntry = 0;
}
RoomExitJoinData *Resources::getExitJoin(uint16 hotspotId) {
@@ -242,6 +293,14 @@
return NULL;
}
+bool Resources::checkHotspotExtent(HotspotData *hotspot) {
+ uint16 roomNum = hotspot->roomNumber;
+ RoomData *room = getRoom(roomNum);
+
+ return (hotspot->startX >= room->clippingXStart) && ((room->clippingXEnd == 0) ||
+ (hotspot->startX + 32 < room->clippingXEnd));
+}
+
void Resources::insertPaletteSubset(Palette &p) {
p.palette()->copyFrom(_paletteSubset->palette(), 0, 129*4, 60*4);
p.palette()->copyFrom(_paletteSubset->palette(), 60*4, 220*4, 8*4);
@@ -298,10 +357,36 @@
return list->getActionOffset(action);
}
+TalkHeaderData *Resources::getTalkHeader(uint16 hotspotId) {
+ TalkHeaderList::iterator i;
+ for (i = _talkHeaders.begin(); i != _talkHeaders.end(); ++i) {
+ TalkHeaderData *rec = *i;
+ if (rec->characterId == hotspotId) return rec;
+ }
+ return NULL;
+}
+
HotspotActionList *Resources::getHotspotActions(uint16 actionsOffset) {
return _actionsList.getActions(actionsOffset);
}
+void Resources::setTalkingCharacter(uint16 id) {
+ if (_talkingCharacter != 0)
+ deactivateHotspot(_talkingCharacter, true);
+
+ _talkingCharacter = id;
+
+ if (_talkingCharacter != 0) {
+ Hotspot *character = getActiveHotspot(id);
+ if (!character)
+ error("Set talking character to non-active hotspot id");
+
+ // Add the special "voice" animation above the character
+ Hotspot *hotspot = new Hotspot(character, VOICE_ANIM_ID);
+ addHotspot(hotspot);
+ }
+}
+
void Resources::activateHotspot(uint16 hotspotId) {
HotspotData *res = getHotspot(hotspotId);
if (!res) return;
@@ -372,15 +457,22 @@
return hotspot;
}
-void Resources::deactivateHotspot(uint16 hotspotId) {
+void Resources::addHotspot(Hotspot *hotspot) {
+ _activeHotspots.push_back(hotspot);
+}
+
+void Resources::deactivateHotspot(uint16 hotspotId, bool isDestId) {
HotspotList::iterator i = _activeHotspots.begin();
while (i != _activeHotspots.end()) {
Hotspot *h = *i;
- if (h->hotspotId() == hotspotId)
- i = _activeHotspots.erase(i);
- else
- i++;
+ if ((!isDestId && (h->hotspotId() == hotspotId)) ||
+ (isDestId && (h->destHotspotId() == hotspotId) && (h->hotspotId() == 0xffff))) {
+ _activeHotspots.erase(i);
+ break;
+ }
+
+ i++;
}
}
@@ -396,4 +488,36 @@
return numItems;
}
+void Resources::copyCursorTo(Surface *s, uint8 cursorNum, int16 x, int16 y) {
+ byte *pSrc = getCursor(cursorNum);
+ byte *pDest = s->data().data() + (y * FULL_SCREEN_WIDTH) + x;
+
+ for (int yP = 0; yP < CURSOR_HEIGHT; ++yP) {
+ for (int xP = 0; xP < CURSOR_WIDTH; ++xP) {
+ if (*pSrc != 0) *pDest = *pSrc;
+ ++pSrc;
+ ++pDest;
+ }
+ pDest += FULL_SCREEN_WIDTH - CURSOR_WIDTH;
+ }
+}
+
+void Resources::setTalkData(uint16 offset) {
+ if (offset == 0) {
+ _activeTalkData = NULL;
+ return;
+ }
+
+ TalkDataList::iterator i;
+ for (i = _talkData.begin(); i != _talkData.end(); ++i) {
+ TalkData *rec = *i;
+ if (rec->recordId == offset) {
+ _activeTalkData = rec;
+ return;
+ }
+ }
+
+ error("Unknown talk entry offset %d requested", offset);
+}
+
} // end of namespace Lure
Modified: scummvm/trunk/engines/lure/res.h
===================================================================
--- scummvm/trunk/engines/lure/res.h 2006-02-19 04:15:33 UTC (rev 20763)
+++ scummvm/trunk/engines/lure/res.h 2006-02-19 04:17:54 UTC (rev 20764)
@@ -32,10 +32,17 @@
namespace Lure {
+enum TalkState {TALK_NONE, TALK_SELECT, TALK_RESPOND, TALK_RESPONSE_WAIT,
+ TALK_RESPOND_2};
+
+#define MAX_TALK_SELECTIONS 4
+typedef TalkEntryData *TalkSelections[MAX_TALK_SELECTIONS];
+
class Resources {
private:
Common::RandomSource _rnd;
Palette *_paletteSubset;
+ MemoryBlock *_cursors;
RoomDataList _roomData;
HotspotDataList _hotspotData;
HotspotOverrideList _hotspotOverrides;
@@ -48,8 +55,19 @@
HotspotList _activeHotspots;
ValueTableData _fieldList;
HotspotActionSet _actionsList;
+ TalkHeaderList _talkHeaders;
+ TalkDataList _talkData;
SequenceDelayList _delayList;
+ Action _currentAction;
+ MemoryBlock *_talkDialogData;
+ TalkData *_activeTalkData;
+ TalkState _talkState;
+ TalkSelections _talkSelections;
+ int _talkSelection;
+ int _talkStartEntry;
+ uint16 _talkingCharacter;
+
void freeData();
public:
Resources();
@@ -60,8 +78,12 @@
byte *getResource(uint16 resId);
RoomDataList &roomData() { return _roomData; }
RoomData *getRoom(uint16 roomNumber);
+ bool checkHotspotExtent(HotspotData *hotspot);
void insertPaletteSubset(Palette &p);
+ byte *getCursor(uint8 cursorNum) {
+ return _cursors->data() + (cursorNum * CURSOR_SIZE);
+ }
HotspotDataList &hotspotData() { return _hotspotData; }
HotspotOverrideList &hotspotOverrides() { return _hotspotOverrides; }
HotspotAnimList &animRecords() { return _animData; }
@@ -79,14 +101,33 @@
RoomExitJoinData *getExitJoin(uint16 hotspotId);
uint16 getHotspotAction(uint16 actionsOffset, Action action);
HotspotActionList *getHotspotActions(uint16 actionsOffset);
+ TalkHeaderData *getTalkHeader(uint16 hotspotId);
ValueTableData &fieldList() { return _fieldList; }
SequenceDelayList &delayList() { return _delayList; }
+ MemoryBlock &getTalkDialogData() { return *_talkDialogData; }
+ void copyCursorTo(Surface *s, uint8 cursorNum, int16 x, int16 y);
+
uint16 numInventoryItems();
-
+ void setTalkData(uint16 offset);
+ TalkData *getTalkData() { return _activeTalkData; }
+ void setTalkState(TalkState state) { _talkState = state; }
+ TalkState getTalkState() { return _talkState; }
+ TalkSelections &getTalkSelections() { return _talkSelections; }
+ void setTalkSelection(int index) { _talkSelection = index; }
+ int getTalkSelection() { return _talkSelection; }
+ void setTalkStartEntry(int index) { _talkStartEntry = index; }
+ int getTalkStartEntry() { return _talkStartEntry; }
+ uint16 getTalkingCharacter() { return _talkingCharacter; }
+ void setTalkingCharacter(uint16 id);
+
+ void setCurrentAction(Action action) { _currentAction = action; }
+ Action getCurrentAction() { return _currentAction; }
+ const char *getCurrentActionStr() { return actionList[_currentAction]; }
+
void activateHotspot(uint16 hotspotId);
Hotspot *addHotspot(uint16 hotspotId);
- void deactivateHotspot(uint16 hotspotId);
-
+ void addHotspot(Hotspot *hotspot);
+ void deactivateHotspot(uint16 hotspotId, bool isDestId = false);
};
} // End of namespace Lure
More information about the Scummvm-git-logs
mailing list