zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add some debugging information for GZSDF pagenames feature

Browse source
This commit is contained in:
Rachael Alexanderson 2019-05-22 11:50:53 -04:00
parent a04d79d871
commit a27990885e
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/maploader/usdf.cpp
View file

@ -566,7 +566,10 @@ public:
if (nameToIndex.CheckKey(key)) if (nameToIndex.CheckKey(key))
Printf("Warning! Duplicate page name '%s'!\n", Level->StrifeDialogues[i]->ThisNodeName.GetChars()); Printf("Warning! Duplicate page name '%s'!\n", Level->StrifeDialogues[i]->ThisNodeName.GetChars());
else else
{
nameToIndex[key] = i; nameToIndex[key] = i;
DPrintf(DMSG_NOTIFY, "GZSDF linker: Assigning pagename '%s' to node %i\n", key, i);
}
usedstrings = true; usedstrings = true;
} }
} }
@ -579,7 +582,10 @@ public:
{ {
itemLinkKey.ToLower(); itemLinkKey.ToLower();
if (nameToIndex.CheckKey(itemLinkKey)) if (nameToIndex.CheckKey(itemLinkKey))
{
Level->StrifeDialogues[i]->ItemCheckNode = nameToIndex[itemLinkKey] + 1; Level->StrifeDialogues[i]->ItemCheckNode = nameToIndex[itemLinkKey] + 1;
DPrintf(DMSG_NOTIFY, "GZSDF linker: Item Link '%s' in node %i was index %i\n", itemLinkKey, i, nameToIndex[itemLinkKey]);
}
else else
Printf("Warning! Reference to non-existent item-linked dialogue page name '%s' in page %i!\n", Level->StrifeDialogues[i]->ItemCheckNodeName.GetChars(), i); Printf("Warning! Reference to non-existent item-linked dialogue page name '%s' in page %i!\n", Level->StrifeDialogues[i]->ItemCheckNodeName.GetChars(), i);
} }
@ -592,7 +598,10 @@ public:
FString key = NodeCheck->NextNodeName; FString key = NodeCheck->NextNodeName;
key.ToLower(); key.ToLower();
if (nameToIndex.CheckKey(key)) if (nameToIndex.CheckKey(key))
{
NodeCheck->NextNode = nameToIndex[key] + 1; NodeCheck->NextNode = nameToIndex[key] + 1;
DPrintf(DMSG_NOTIFY, "GZSDF linker: Nextpage Link '%s' in node %i was index %i\n", key, i, nameToIndex[key]);
}
else else
Printf("Warning! Reference to non-existent reply-linked dialogue page name '%s' in page %i!\n", NodeCheck->NextNodeName.GetChars(), i); Printf("Warning! Reference to non-existent reply-linked dialogue page name '%s' in page %i!\n", NodeCheck->NextNodeName.GetChars(), i);
} }

6
src/p_conversation.cpp
View file

@ -586,6 +586,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
{ {
int rootnode = npc->ConversationRoot; int rootnode = npc->ConversationRoot;
const unsigned next = (unsigned)(rootnode + reply->NextNode - 1); const unsigned next = (unsigned)(rootnode + reply->NextNode - 1);
FString nextname = reply->NextNodeName;
if (next < Level->StrifeDialogues.Size()) if (next < Level->StrifeDialogues.Size())
{ {
@ -606,7 +607,10 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
} }
else else
{ {
Printf ("Next node %u is invalid, no such dialog page\n", next); if (nextname.IsEmpty())
Printf ("Next node %u is invalid, no such dialog page\n", next);
else
Printf ("Next node %u ('%s') is invalid, no such dialog page\n", next, nextname);
} }
} }