[Scummvm-cvs-logs] SF.net SVN: scummvm: [23692] scummvm/trunk/engines/lure
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Mon Aug 7 15:21:28 CEST 2006
Revision: 23692
Author: dreammaster
Date: 2006-08-07 06:21:15 -0700 (Mon, 07 Aug 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23692&view=rev
Log Message:
-----------
Enhanced Room::setTalkDialog to be passed the destination character and active item hotspot Id
Modified Paths:
--------------
scummvm/trunk/engines/lure/room.cpp
scummvm/trunk/engines/lure/room.h
Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp 2006-08-07 13:19:10 UTC (rev 23691)
+++ scummvm/trunk/engines/lure/room.cpp 2006-08-07 13:21:15 UTC (rev 23692)
@@ -554,30 +554,33 @@
}
if (oldHotspotId != _hotspotId)
- StringData::getReference().getString(_hotspotNameId, _hotspotName, NULL, NULL);
+ StringData::getReference().getString(_hotspotNameId, _hotspotName);
}
if (mouse.getCursorNum() != newCursor)
mouse.setCursorNum(newCursor);
}
-void Room::setTalkDialog(uint16 characterId, uint16 stringId) {
+void Room::setTalkDialog(uint16 srcCharacterId, uint16 destCharacterId, uint16 usedId, uint16 stringId) {
+ debugC(ERROR_DETAILED, kLureDebugAnimations, "Room::setTalkDialog - char=%xh string=%d",
+ srcCharacterId, stringId);
+
if (_talkDialog) {
delete _talkDialog;
_talkDialog = NULL;
}
Resources &res = Resources::getReference();
- res.setTalkingCharacter(characterId);
+ res.setTalkingCharacter(srcCharacterId);
- if (characterId == 0)
+ if (srcCharacterId == 0)
return;
- HotspotData *character = res.getHotspot(characterId);
+ HotspotData *character = res.getHotspot(srcCharacterId);
if (character->roomNumber != _roomNumber)
return;
- _talkDialog = new TalkDialog(characterId, stringId);
+ _talkDialog = new TalkDialog(srcCharacterId, destCharacterId, usedId, stringId);
_talkDialogX = character->startX + (character->width / 2) - (TALK_DIALOG_WIDTH / 2);
if (_talkDialogX < 0) _talkDialogX = 0;
Modified: scummvm/trunk/engines/lure/room.h
===================================================================
--- scummvm/trunk/engines/lure/room.h 2006-08-07 13:19:10 UTC (rev 23691)
+++ scummvm/trunk/engines/lure/room.h 2006-08-07 13:21:15 UTC (rev 23692)
@@ -104,7 +104,7 @@
bool showInfo() { return _showInfo; }
CursorState cursorState() { return _cursorState; }
void setShowInfo(bool value) { _showInfo = value; }
- void setTalkDialog(uint16 characterId, uint16 descId);
+ void setTalkDialog(uint16 srcCharacterId, uint16 destCharacterId, uint16 usedId, uint16 stringId);
void setCursorState(CursorState state) { _cursorState = state; }
bool checkInTalkDialog();
char *statusLine() { return _statusLine; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list