From 7e76fb0078aaee16d4a1821de84e3098e0cb8645 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Fri, 9 Aug 2013 00:25:29 -0400
Subject: [PATCH] - Fixed: Disable ifitem jumping if a link isn't specified
 since an invalid value can cause a crash.

---
 src/p_conversation.cpp | 2 +-
 src/p_usdf.cpp         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index d567f9866..350c46478 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -1152,7 +1152,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
 				break;
 			}
 		}
-		if (jump)
+		if (jump && CurNode->ItemCheckNode > 0)
 		{
 			int root = pc->player->ConversationNPC->ConversationRoot;
 			CurNode = StrifeDialogues[root + CurNode->ItemCheckNode - 1];
diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp
index dc287384d..95c8f5dc0 100644
--- a/src/p_usdf.cpp
+++ b/src/p_usdf.cpp
@@ -288,6 +288,7 @@ class USDFParser : public UDMFParserBase
 		//node->ItemCheckCount[0] = node->ItemCheckCount[1] = node->ItemCheckCount[2] = -1;
 
 		node->ThisNodeNum = StrifeDialogues.Push(node);
+		node->ItemCheckNode = -1;
 
 		FString SpeakerName;
 		FString Dialogue;