Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset wait popup on activity finish #73814

Merged
merged 1 commit into from
May 18, 2024

Conversation

irwiss
Copy link
Contributor

@irwiss irwiss commented May 15, 2024

Summary

None

Purpose of change

Fixes #73810

Describe the solution

Reset wait popup on activity cancel/finish

Also clean up access to game::wait_popup and remove advanced_inventory friend from game as accessing wait_popup seems to be it's only use

Describe alternatives you've considered

Testing

Steps in the issue

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels May 15, 2024
src/game.cpp Outdated Show resolved Hide resolved
src/do_turn.cpp Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 16, 2024
@dseguin dseguin merged commit a7fd858 into CleverRaven:master May 18, 2024
26 checks passed
@irwiss irwiss deleted the reset-wait-popup branch May 18, 2024 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"interacting with the vehicle" dialog stays visible after action is complete
3 participants