From afa644fe470edf4e96f6241985a41fd0f6fc6e64 Mon Sep 17 00:00:00 2001 From: drfrag Date: Wed, 22 May 2019 23:31:58 +0200 Subject: [PATCH] - Fixed compilation with old gcc and clang. --- src/maploader/usdf.cpp | 6 +++--- src/p_conversation.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/maploader/usdf.cpp b/src/maploader/usdf.cpp index fa218bfb8..b2df9503c 100644 --- a/src/maploader/usdf.cpp +++ b/src/maploader/usdf.cpp @@ -568,7 +568,7 @@ public: else { nameToIndex[key] = i; - DPrintf(DMSG_NOTIFY, "GZSDF linker: Assigning pagename '%s' to node %i\n", key, i); + DPrintf(DMSG_NOTIFY, "GZSDF linker: Assigning pagename '%s' to node %i\n", key.GetChars(), i); } usedstrings = true; } @@ -584,7 +584,7 @@ public: if (nameToIndex.CheckKey(itemLinkKey)) { 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]); + DPrintf(DMSG_NOTIFY, "GZSDF linker: Item Link '%s' in node %i was index %i\n", itemLinkKey.GetChars(), i, nameToIndex[itemLinkKey]); } else Printf("Warning! Reference to non-existent item-linked dialogue page name '%s' in page %i!\n", Level->StrifeDialogues[i]->ItemCheckNodeName.GetChars(), i); @@ -600,7 +600,7 @@ public: if (nameToIndex.CheckKey(key)) { NodeCheck->NextNode = nameToIndex[key] + 1; - DPrintf(DMSG_NOTIFY, "GZSDF linker: Nextpage Link '%s' in node %i was index %i\n", key, i, nameToIndex[key]); + DPrintf(DMSG_NOTIFY, "GZSDF linker: Nextpage Link '%s' in node %i was index %i\n", key.GetChars(), i, nameToIndex[key]); } else Printf("Warning! Reference to non-existent reply-linked dialogue page name '%s' in page %i!\n", NodeCheck->NextNodeName.GetChars(), i); diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 948abff7b..58fd6f3d4 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -610,7 +610,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply 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); + Printf ("Next node %u ('%s') is invalid, no such dialog page\n", next, nextname.GetChars()); } }