From 3c8fc4f263c96a61a8b1aedbfca418713eee9d02 Mon Sep 17 00:00:00 2001 From: elexis Date: Thu, 5 Jan 2017 10:22:39 +0000 Subject: [PATCH] Return "local" from GetPlayerGUID to avoid duplicate checks and allow AIs to send private messages to the single player. Refs #4431. Reviewed By: mimo Differential Revision: https://code.wildfiregames.com/D38 This was SVN commit r19112. --- binaries/data/mods/public/gui/gamesetup/gamesetup.js | 2 +- binaries/data/mods/public/gui/session/messages.js | 6 +++--- source/gui/scripting/ScriptFunctions.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js index cdc43f054a..c94dcf3ea6 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js @@ -1807,7 +1807,7 @@ function addChatMessage(msg) { if (msg.type != "system" && msg.text) { - let userName = g_PlayerAssignments[Engine.GetPlayerGUID() || "local"].name; + let userName = g_PlayerAssignments[Engine.GetPlayerGUID()].name; if (userName != g_PlayerAssignments[msg.guid].name) notifyUser(userName, msg.text); diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js index eb407fecaa..e2d3360cff 100644 --- a/binaries/data/mods/public/gui/session/messages.js +++ b/binaries/data/mods/public/gui/session/messages.js @@ -692,7 +692,7 @@ function updateChatAddressees() let guids = sortGUIDsByPlayerID(); for (let guid of guids) { - if (guid == Engine.GetPlayerGUID() || guid == "local") + if (guid == Engine.GetPlayerGUID()) continue; let playerID = g_PlayerAssignments[guid].player; @@ -953,7 +953,7 @@ function formatChatCommand(msg) { msg.text = escapeText(msg.text); - let userName = g_PlayerAssignments[Engine.GetPlayerGUID() || "local"].name; + let userName = g_PlayerAssignments[Engine.GetPlayerGUID()].name; if (userName != g_PlayerAssignments[msg.guid].name) notifyUser(userName, msg.text); @@ -990,7 +990,7 @@ function parseChatAddressee(msg) // Chat messages sent by the simulation (AI) come with the playerID. let senderID = msg.player ? msg.player : (g_PlayerAssignments[msg.guid] || msg).player; - let isSender = msg.guid && msg.guid != "local" ? + let isSender = msg.guid ? msg.guid == Engine.GetPlayerGUID() : senderID == Engine.GetPlayerID(); diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp index a366c909aa..2448e40c8b 100644 --- a/source/gui/scripting/ScriptFunctions.cpp +++ b/source/gui/scripting/ScriptFunctions.cpp @@ -407,7 +407,7 @@ void DisconnectNetworkGame(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) std::string GetPlayerGUID(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) { if (!g_NetClient) - return std::string(); + return "local"; return g_NetClient->GetGUID(); }