gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Allow observers to follow gaia commands on triggerscript maps.

Browse Source 
This was SVN commit r21464.
This commit is contained in:
elexis
2018-03-08 14:10:45 +00:00
parent adb84c50fb
commit 147ef2b892
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/session/messages.js
+3 -2
View File
@@ -436,9 +436,10 @@ var g_NotificationsTypes =
let cmd = notification.cmd;
// Ignore boring animals
// Ignore rallypoint commands of trained animals
let entState = cmd.entities && cmd.entities[0] && GetEntityState(cmd.entities[0]);
if (entState && entState.identity && entState.identity.classes &&
if (g_ViewedPlayer != 0 &&
entState && entState.identity && entState.identity.classes &&
entState.identity.classes.indexOf("Animal") != -1)
return;
binaries/data/mods/public/gui/session/session.js
+2 -1
View File
@@ -663,7 +663,8 @@ function updateTopPanel()
});
}
Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver || !isPlayer;
Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver ||
!isPlayer && (g_ViewedPlayer != 0 || g_GameAttributes.settings.Keywords.indexOf("trigger") == -1);
let viewPlayer = Engine.GetGUIObjectByName("viewPlayer");
viewPlayer.hidden = !g_IsObserver && !g_DevSettings.changePerspective;