Don't pause music when pausing the game / Fix victory music in SP.
ClosedPublic
Actions

Authored by wraitii on Jan 20 2021, 11:23 AM.

Details

Reviewers: None
Commits: rP24744: Don't pause music when pausing the game / Fix victory music in SP.
Trac Tickets: #5941

Summary

Victory music doesn't work in A24 SP. That's because the modal pauses the game, and pausing the game pauses music.
This has been the case since rP13347.

Auto-pausing the game (structree, ...) didn't really happen in the past, but A24 makes it relatively common, and I think pausing the music is a bit jarring then, so this simply removes that.

Reported by: @Langbart

Test Plan

Play a Conquest game in SP with all players in the same team -> Vicotry music is bugged no longer.

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

wraitii created this revision.Jan 20 2021, 11:23 AM

Freagarach edited the summary of this revision. (Show Details)Jan 20 2021, 11:24 AM

Freagarach added a subscriber: Langbart.

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_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/Framew

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

Harbormaster completed remote builds in B15280: Diff 15562.Jan 20 2021, 11:44 AM

wraitii requested review of this revision.Jan 20 2021, 11:44 AM

Running rP24739 with patch D3433 works for me. It produces the intended results.
Game victorious music plays before you click on any button. Clicking on 'Yes' doesn't stop it (clicking on "No" then exitting does however). Exactly like in A23b. Tested the pause function works as intended. @Freagarach also agreed (IRC 20thJan'21)

10:12 < wraitii> TBH I'm not sure it's a good idea to pause the music when we pause the game
10:12 < Freagarach> ^ +1
10:12 < wraitii> Didn't use to be an issue because we rarely paused the game, but now it's semi common (struct tree...) in SP
10:14 < wraitii> mmh I guess it would perhaps be good to pause it if the game is "paused in background"
10:15 < Freagarach> OnLossFocus?

Would it be possible to stop the victorious music playing in a loop (You_are_Victorious!.ogg is 45secs long) after clicking "No". Sometimes I like to move around and see what my opponent has built or I might even continue playing, the constant victory loop gets annoying. I still want music but not the victory loop music just the normal stuff.

Langbart added a subscriber: Freagarach.Jan 21 2021, 6:21 AM

Langbart mentioned this in D3435: Add Shift+Space as an alternative Pause hotkey.Jan 21 2021, 6:24 AM

Probably possible, but another diff for sure :)

This revision was not accepted when it landed; it landed in state Needs Review.Jan 21 2021, 10:34 AM

Closed by commit rP24744: Don't pause music when pausing the game / Fix victory music in SP. (authored by wraitii). · Explain Why

This revision was automatically updated to reflect the committed changes.

wraitii added a commit: rP24744: Don't pause music when pausing the game / Fix victory music in SP..