Page MenuHomeWildfire Games

Fix error in GATHERING when disbanding formation while members gather.
ClosedPublic

Authored by wraitii on Jan 22 2021, 3:11 PM.

Details

Summary

Since rP24480, there is a "LeaveFormation" order to support queued-disbanding. However, I misread the code paths and FinishOrder() isn't always called.
This fixes that oversight.

Reported by: Freagarach

Test Plan

Repro: get a formation, order members to gather while in formation, then when they're gathering remove them from the formation.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
temp
Lint
Lint OK
SeverityLocationCodeMessage
Warningbinaries/data/mods/public/simulation/components/UnitAI.js:348ESLintBear (consistent-return)ESLintBear (consistent-return)
Warningbinaries/data/mods/public/simulation/components/UnitAI.js:790ESLintBear (no-else-return)ESLintBear (no-else-return)
Warningbinaries/data/mods/public/simulation/components/UnitAI.js:2159ESLintBear (operator-linebreak)ESLintBear (operator-linebreak)
Unit
No Unit Test Coverage
Build Status
Buildable 15346
Build 33458: Vulcan BuildJenkins
Build 33457: Vulcan Build (macOS)Jenkins
Build 33456: Vulcan Build (Windows)Jenkins
Build 33455: arc lint + arc unit

Event Timeline

wraitii created this revision.Jan 22 2021, 3:11 PM

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/Cor

See https://jenkins.wildfiregames.com/job/macos-differential/3017/display/redirect for more details.

wraitii requested review of this revision.Jan 22 2021, 3:21 PM
Stan added a subscriber: Stan.Jan 22 2021, 3:44 PM
Stan added inline comments.
binaries/data/mods/public/simulation/components/UnitAI.js
220

What other orders can it be ?

wraitii added inline comments.Jan 22 2021, 3:45 PM
binaries/data/mods/public/simulation/components/UnitAI.js
220

Almost any order

Freagarach added inline comments.
binaries/data/mods/public/simulation/components/UnitAI.js
220

Is it guaranteed to have an order? (Perhaps check for this.order first.)

This revision was not accepted when it landed; it landed in state Needs Review.Jan 23 2021, 9:08 AM
This revision was automatically updated to reflect the committed changes.