Differential D4588

Fix selecting formations when cycling idle entities.
ClosedPublic
Actions

Authored by Freagarach on Apr 3 2022, 7:46 AM.

Details

Reviewers

None

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Commits

rP26756: Fix selecting formations when cycling through idle entities.

Trac Tickets

#6490

Summary

Since formations have cmpIdentity now, they were incorrectly selected when cycling idle units.

This excludes them from the search.

Test Plan

Cycle trough idle entities with some entities in a formation.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Freagarach created this revision.Apr 3 2022, 7:46 AM

Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Apr 3 2022, 7:46 AM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
fatal errorfatal error: : fatal error: fatal errorfile '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built: 
file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built
file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built
file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/glad/include/glad/gl.h' has been modified since the precompiled header 'obj/graphics_Debug/precompiled.h.gch' was built
note: notenotenote: : please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'
please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch': please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'please rebuild precompiled header 'obj/graphics_Debug/precompiled.h.gch'


1 error generated.
make[1]: *** [obj/graphics_Debug/MiniMapTexture.o] Error 1
make[1]: *** Waiting for unfinished jobs....
1 error generated.
make[1]: *** [obj/graphics_Debug/CinemaManager.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapGenerator.o] Error 1
1 error generated.
make[1]: *** [obj/graphics_Debug/MapReader.o] Error 1
make: *** [graphics] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/5896/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/6987/display/redirect

Harbormaster completed remote builds in B20054: Diff 20044.Apr 3 2022, 8:11 AM

Freagarach requested review of this revision.Apr 3 2022, 8:11 AM

This fixes the problem in the listed ticket.

This revision was not accepted when it landed; it landed in state Needs Review.Apr 3 2022, 7:37 PM

This revision was landed with ongoing or failed builds.

Closed by commit rP26756: Fix selecting formations when cycling through idle entities. (authored by Freagarach). · Explain Why

This revision was automatically updated to reflect the committed changes.

Freagarach added a commit: rP26756: Fix selecting formations when cycling through idle entities..