From 41f8a2ff6a3aa40d6d28e0480bb7f166f25a7f28 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 9 Dec 2007 05:59:01 +0000 Subject: Added extra debug statements svn-id: r29773 --- engines/lure/hotspots.cpp | 8 ++++++++ engines/lure/res.cpp | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index eb1a625cb4..0ce0f69b88 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -754,6 +754,8 @@ void Hotspot::converse(uint16 destCharacterId, uint16 messageId, bool srcStandSt } void Hotspot::showMessage(uint16 messageId, uint16 destCharacterId) { + debugC(ERROR_DETAILED, kLureDebugStrings, "Hotspot::showMessage messageId=%xh srcChar=%xh, destChar=%xh", + messageId, _hotspotId, destCharacterId); Resources &res = Resources::getReference(); MemoryBlock *data = res.messagesData(); Hotspot *hotspot; @@ -775,7 +777,9 @@ void Hotspot::showMessage(uint16 messageId, uint16 destCharacterId) { } // default response if a specific response not found + if (idVal == 0xffff) idVal = 0x8c4; + debugC(ERROR_DETAILED, kLureDebugStrings, "Hotspot::showMessage idVal=%xh", idVal); if (idVal == 0x76) { // Special code id for showing the puzzled talk bubble @@ -1199,6 +1203,10 @@ void Hotspot::doAction() { } void Hotspot::doAction(Action action, HotspotData *hotspot) { + StringList &stringList = Resources::getReference().stringList(); + debugC(ERROR_INTERMEDIATE, kLureDebugHotspots, "Action charId=%xh Action=%d/%s", + _hotspotId, (int)action, stringList.getString((int)action)); + ActionProcPtr actionProcList[NPC_JUMP_ADDRESS + 1] = { &Hotspot::doNothing, &Hotspot::doGet, diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index 7a9bc842e9..e58ce87faf 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -462,8 +462,10 @@ int Resources::getAnimationIndex(HotspotAnimData *animData) { uint16 Resources::getHotspotAction(uint16 actionsOffset, Action action) { HotspotActionList *list = _actionsList.getActions(actionsOffset); - if (!list) return 0; - return list->getActionOffset(action); + uint16 offset = (!list) ? 0 : list->getActionOffset(action); + debugC(ERROR_DETAILED, kLureDebugHotspots, + "Resources::getHotspotAction actionsOffset=%xh result=%xh", actionsOffset, offset); + return offset; } TalkHeaderData *Resources::getTalkHeader(uint16 hotspotId) { -- cgit v1.2.3