From fa9e0af1b70cbe5eae1cb60134633cf4f580db9f Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG <63141077+AconiteGodOfSWG@users.noreply.github.com> Date: Wed, 26 Aug 2020 20:16:00 -0500 Subject: [PATCH] a few more conversation editor script writer fixes --- .../src/win32/SwgConversationEditorDoc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp b/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp index 578bc7c5d..b0865ff21 100644 --- a/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp +++ b/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp @@ -2285,7 +2285,7 @@ bool SwgConversationEditorDoc::writeScript (CString const & scriptName, CString if (numberOfResponses > 0) { // int *_handleBranch (obj_id player, obj_id npc, string_id response) - buffer.Format("int %s_handleBranch%i (obj_id player, obj_id npc, string_id response)\n", fileName, sourceBranch->getBranchId()); + buffer.Format("int %s_handleBranch%i (obj_id player, obj_id npc, string_id response) throws InterruptedException\n", fileName, sourceBranch->getBranchId()); outfile.WriteString(buffer); // { @@ -2314,7 +2314,7 @@ bool SwgConversationEditorDoc::writeScript (CString const & scriptName, CString outfile.WriteString (buffer); // if (response == "") - buffer.Format("\tif (response == \"s_%s\")\n", response->getStringId().c_str()); + buffer.Format("\tif (response.equals(\"s_%s\"))\n", response->getStringId().c_str()); outfile.WriteString (buffer); // { @@ -2371,7 +2371,7 @@ bool SwgConversationEditorDoc::writeScript (CString const & scriptName, CString outfile.WriteString (cs_scriptTriggerDelimiter); { outfile.WriteString ("//-- This function should move to base_class.java\n"); - outfile.WriteString ("boolean npcStartConversation(obj_id player, obj_id npc, string convoName, string_id greetingId, prose_package greetingProse, string_id[] responses)\n"); + outfile.WriteString ("boolean npcStartConversation(obj_id player, obj_id npc, String convoName, string_id greetingId, prose_package greetingProse, string_id[] responses)\n"); outfile.WriteString ("{\n"); outfile.WriteString ("\tObject[] objects = new Object[responses.length];\n"); outfile.WriteString ("\tSystem.arraycopy(responses, 0, objects, 0, responses.length);\n");