From def811b12260833750568caa0d47008ae8bb9d30 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG <63141077+AconiteGodOfSWG@users.noreply.github.com> Date: Tue, 25 Aug 2020 18:37:27 -0500 Subject: [PATCH 1/3] Fix storing user and pass in client cfg --- .../src/shared/page/SwgCuiLoginScreen.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp index 3631acae3..cc6cd0bd3 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp @@ -85,12 +85,19 @@ m_connecting (false) } else { - m_passwordTextbox->SetLocalText (Unicode::emptyString); + if (ConfigClientGame::getLoginClientID()) { + m_usernameTextbox->SetLocalText(Unicode::narrowToWide(ConfigClientGame::getLoginClientID())); + } + else { + m_usernameTextbox->SetLocalText(Unicode::emptyString); + } - if (ConfigClientGame::getLoginClientID ()) - m_usernameTextbox->SetLocalText (Unicode::narrowToWide (ConfigClientGame::getLoginClientID ())); - else - m_usernameTextbox->SetLocalText (Unicode::emptyString); + if (ConfigClientGame::getLoginClientPassword()) { + m_passwordTextbox->SetLocalText(Unicode::narrowToWide(ConfigClientGame::getLoginClientPassword())); + } + else { + m_passwordTextbox->SetLocalText(Unicode::emptyString); + } } DEBUG_REPORT_LOG_PRINT (true, ("SwgCuiLoginScreen: username=%s, sessionId=%s\n", ConfigClientGame::getLoginClientID (), sessionId ? sessionId : "null")); 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 2/3] 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"); From 807db952f168aa5e82720444929aea92e6ff12e1 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG <63141077+AconiteGodOfSWG@users.noreply.github.com> Date: Thu, 27 Aug 2020 16:18:06 -0500 Subject: [PATCH 3/3] one more conversation editor fix --- .../src/win32/SwgConversationEditorDoc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp b/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp index b0865ff21..5eb833a7e 100644 --- a/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp +++ b/src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp @@ -2407,8 +2407,8 @@ bool SwgConversationEditorDoc::writeScript (CString const & scriptName, CString { outfile.WriteString ("public int OnNpcConversationResponse(obj_id self, String conversationId, obj_id player, string_id response) throws InterruptedException\n{\n"); - // if (conversationId != ) - buffer.Format ("\tif (conversationId != \"%s\")\n", fileName); + // if (!conversationId.equals()) + buffer.Format ("\tif (!conversationId.equals(\"%s\"))\n", fileName); outfile.WriteString (buffer); // return SCRIPT_CONTINUE;