Page MenuHomeWildfire Games

Fix sound not played when being attacked.
ClosedPublic

Authored by Freagarach on Jan 18 2021, 9:09 AM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24694: Fix sound not played when being attacked by non-capture attacks.
Trac Tickets
#5925
Summary

Wrong assumptions during review of D2859 and D2661. rP23989 and rP24500.

Test Plan

Get attacked, notice sound plays, as well as a different sound when being captured.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
SeverityLocationCodeMessage
Warningbinaries/data/mods/public/simulation/components/AttackDetection.js:42ESLintBear (spaced-comment)ESLintBear (spaced-comment)
Warningbinaries/data/mods/public/simulation/components/AttackDetection.js:56ESLintBear (spaced-comment)ESLintBear (spaced-comment)
Warningbinaries/data/mods/public/simulation/components/AttackDetection.js:107ESLintBear (operator-linebreak)ESLintBear (operator-linebreak)
Unit
No Unit Test Coverage
Build Status
Buildable 15181
Build 32956: Vulcan BuildJenkins
Build 32955: Vulcan Build (macOS)Jenkins
Build 32954: Vulcan Build (Windows)Jenkins
Build 32953: arc lint + arc unit

Event Timeline

Freagarach created this revision.Jan 18 2021, 9:09 AM
Owners added a subscriber: Restricted Owners Package.Jan 18 2021, 9:09 AM

Build is green

builderr-debug-macos.txt
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/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

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

Freagarach requested review of this revision.Jan 18 2021, 9:37 AM
Stan added a comment.Jan 18 2021, 9:48 AM

Why not adapt the method? Also, do you think we need capture or it won't be used anyway?

Because the file is for the attack effects and the sound for the attack types.

Stan added a comment.Jan 18 2021, 9:50 AM

The rest is my code so LGTM :)

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