dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deduplicate GetEntityState(clickedEntity) calls

Browse source
This commit is contained in:
Vantha 2026-02-27 21:26:51 +01:00 committed by Vantha
parent 8c36cc4879
commit 0a7a6aac87
No known key found for this signature in database
GPG key ID: 3F5D02FA4D3E8E74
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
binaries/data/mods/public/gui/session/input.js
View file

@ -1130,8 +1130,9 @@ function handleInputAfterGui(ev)
{ {
if (clickedEntity == INVALID_ENTITY) if (clickedEntity == INVALID_ENTITY)
clickedEntity = Engine.PickEntityAtPoint(ev.x, ev.y); clickedEntity = Engine.PickEntityAtPoint(ev.x, ev.y);
const clickedEntityState = GetEntityState(clickedEntity);
// Abort if we didn't click on an entity or if the entity was removed before the mousebuttonup event. // Abort if we didn't click on an entity or if the entity was removed before the mousebuttonup event.
if (clickedEntity == INVALID_ENTITY || !GetEntityState(clickedEntity)) if (clickedEntity == INVALID_ENTITY || !clickedEntityState)
{ {
clickedEntity = INVALID_ENTITY; clickedEntity = INVALID_ENTITY;
if (!Engine.HotkeyIsPressed("selection.add") && !Engine.HotkeyIsPressed("selection.remove")) if (!Engine.HotkeyIsPressed("selection.add") && !Engine.HotkeyIsPressed("selection.remove"))
@ -1157,18 +1158,18 @@ function handleInputAfterGui(ev)
if (ev.clicks == 2) if (ev.clicks == 2)
{ {
templateToMatch = GetEntityState(clickedEntity).selectionGroupName; templateToMatch = clickedEntityState.selectionGroupName;
if (templateToMatch) if (templateToMatch)
matchRank = false; matchRank = false;
else else
// No selection group name defined, so fall back to exact match. // No selection group name defined, so fall back to exact match.
templateToMatch = GetEntityState(clickedEntity).templateName; templateToMatch = clickedEntityState.templateName;
} }
else else
// Triple click // Triple click
// Select units matching exact template name (same rank). // Select units matching exact template name (same rank).
templateToMatch = GetEntityState(clickedEntity).templateName; templateToMatch = clickedEntityState.templateName;
// TODO: Should we handle "control all units" here as well? // TODO: Should we handle "control all units" here as well?
ents = Engine.PickSimilarPlayerEntities(templateToMatch, showOffscreen, matchRank, false); ents = Engine.PickSimilarPlayerEntities(templateToMatch, showOffscreen, matchRank, false);