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

CINE: Fix disabled action menu and autosave thumbnail. #2396

Merged
merged 2 commits into from Aug 1, 2020

Conversation

@karisal
Copy link
Contributor

karisal commented Aug 1, 2020

This pull request has two bugfixes:

#1:
Future Wars PC disassembly does not save disableSysteMenu variable.
After adding versioning to Future Wars saves this value was also
saved and loaded but using it on load seems to have caused the
action menu (EXAMINE, TAKE, INVENTORY, ...) to be disabled sometimes
when it is not supposed to be disabled. Thus, now skipping the loading
of disableSystemMenu variable for versioned Future Wars saves.

#2:
Using the current screen contents for autosaves now.
For non-autosaves the screen contents before opening
the system menu are used.

karisal added 2 commits Aug 1, 2020
Future Wars PC disassembly does not save disableSysteMenu variable.
After adding versioning to Future Wars saves this value was also
saved and loaded but using it on load seems to have caused the
action menu (EXAMINE, TAKE, INVENTORY, ...) to be disabled sometimes
when it is not supposed to be disabled. Thus, now skipping the loading
of disableSystemMenu variable for versioned Future Wars saves.
Using the current screen contents for autosaves now.
For non-autosaves the screen contents before opening
the system menu are used.
@karisal karisal changed the title CINE: FW: Fix disabled action menu after loading. CINE: Fix disable menu and autosave thumbnail. Aug 1, 2020
@karisal karisal changed the title CINE: Fix disable menu and autosave thumbnail. CINE: Fix disabled menu and autosave thumbnail. Aug 1, 2020
@karisal karisal changed the title CINE: Fix disabled menu and autosave thumbnail. CINE: Fix disable action menu and autosave thumbnail. Aug 1, 2020
@karisal karisal changed the title CINE: Fix disable action menu and autosave thumbnail. CINE: Fix disabled action menu and autosave thumbnail. Aug 1, 2020
@sev-
Copy link
Member

sev- commented Aug 1, 2020

Thanks!

@sev- sev- merged commit f180991 into scummvm:master Aug 1, 2020
5 checks passed
5 checks passed
Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 flui...
Details
Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 fluids...
Details
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 ...
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deepcode-ci-bot Well done, no issues found!
Details
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.