swg-source/client-tools
1
0
Fork 0
mirror of https://github.com/SWG-Source/client-tools.git synced 2026-01-16 23:04:27 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from AconiteGodOfSWG/master

Browse Source 
Fix storing user and pass in client cfg
This commit is contained in:
IrishDarkshadow
2020-09-14 08:40:20 +01:00
committed by GitHub
parent 095a6b5adb 807db952f1
commit 896f9926a3
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp
View File

@@ -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"));

10
src/game/server/application/SwgConversationEditor/src/win32/SwgConversationEditorDoc.cpp
View File

@@ -2285,7 +2285,7 @@ bool SwgConversationEditorDoc::writeScript (CString const & scriptName, CString
if (numberOfResponses > 0)
{
// int *_handleBranch<n> (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 == "<responseTextCrc>")
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");
@@ -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 != <conversationId>)
buffer.Format ("\tif (conversationId != \"%s\")\n", fileName);
// if (!conversationId.equals(<conversationId>))
buffer.Format ("\tif (!conversationId.equals(\"%s\"))\n", fileName);
outfile.WriteString (buffer);
// return SCRIPT_CONTINUE;