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

ALL: Pause Token #2147

Merged
merged 27 commits into from May 10, 2020
Merged

ALL: Pause Token #2147

merged 27 commits into from May 10, 2020

Conversation

@henke37
Copy link
Contributor

henke37 commented Mar 15, 2020

This PR introduces a new system for managing the pause counter in engines. By using RAII errors with forgotten or duplicate calls to Engine::pause wont happen.

In particular, this appears to solve the issue in PINK where opening the save and load dialogs from the menu fails to correctly resume the engine.

@henke37
Copy link
Contributor Author

henke37 commented Mar 15, 2020

As a bonus, it also cleans up several engine specific functions that duplicate existing code.

@henke37
Copy link
Contributor Author

henke37 commented Mar 15, 2020

Codacy has clearly never heard of variables whose very lifetime is semantically important.

@henke37 henke37 force-pushed the henke37:pauseToken branch from 01b39b6 to 5409be8 Mar 28, 2020
@henke37
Copy link
Contributor Author

henke37 commented Mar 28, 2020

Took care of the conflict that happened.

@sev-
Copy link
Member

sev- commented Mar 28, 2020

A simple glimpse at the code shows that you do not follow our code formatting guidelines in many places. Please fix.

@sev-
Copy link
Member

sev- commented Mar 28, 2020

...and not following the code naming conventions. This needs to be fixed as well.

@henke37 henke37 force-pushed the henke37:pauseToken branch 2 times, most recently from e170d58 to d247f75 Apr 6, 2020
@henke37
Copy link
Contributor Author

henke37 commented Apr 6, 2020

Hopefully this should take care of all my stupid violations.

@henke37 henke37 force-pushed the henke37:pauseToken branch from d247f75 to 98fee56 Apr 7, 2020
@henke37 henke37 force-pushed the henke37:pauseToken branch 4 times, most recently from db528ff to c229a9f May 10, 2020
@henke37 henke37 force-pushed the henke37:pauseToken branch from c229a9f to 80d470f May 10, 2020
@sev- sev- changed the title Pause Token ALL: Pause Token May 10, 2020
@henke37 henke37 force-pushed the henke37:pauseToken branch from 80d470f to a5cc010 May 10, 2020
@sev-
Copy link
Member

sev- commented May 10, 2020

Thanks! merging, great change!

@sev- sev- merged commit 1b4ce90 into scummvm:master May 10, 2020
0 of 2 checks passed
0 of 2 checks passed
Codacy/PR Quality Review Hang in there, Codacy is reviewing your Pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@henke37 henke37 deleted the henke37:pauseToken branch May 10, 2020
@henke37 henke37 mentioned this pull request May 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.