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: OS: Fallback to default error messages #2442

Merged
merged 1 commit into from Sep 2, 2020
Merged

Conversation

@karisal
Copy link
Contributor

karisal commented Sep 2, 2020

If the error messages can not be found (They are in the file
ERRMESS.DAT in Operation Stealth) then use the default values.

There are now the following default error messages included in ScummVM
for Operation Stealth:

  • American English (Protagonist is James Bond)
  • British English (Protagonist is John Glames)
  • French
  • German

For the Italian and Spanish releases of Operation Stealth the error
messages from Future Wars are used as fallback. This is incorrect
but better than nothing.

This makes the error message handling more lenient than before so that
not having an ERRMESS.DAT does not block the starting of the game
anymore.

Fixes bug #11649.

If the error messages can not be found (They are in the file
ERRMESS.DAT in Operation Stealth) then use the default values.

There are now the following default error messages included in ScummVM
for Operation Stealth:
 - American English (Protagonist is James Bond)
 - British English (Protagonist is John Glames)
 - French
 - German

For the Italian and Spanish releases of Operation Stealth the error
messages from Future Wars are used as fallback. This is incorrect
but better than nothing.

This makes the error message handling more lenient than before so that
not having an ERRMESS.DAT does not block the starting of the game
anymore.

Fixes bug #11649.
@karisal
Copy link
Contributor Author

karisal commented Sep 2, 2020

Please whoever merges this into the master could you
cherry-pick this to the branch-2-2 or tell me how to do
it myself (I have no write access to the master or branch-2-2
repository)? Thank you!

Kari Salminen

@sev-
Copy link
Member

sev- commented Sep 2, 2020

Thank you

@sev- sev- merged commit 1ecb24c into scummvm:master Sep 2, 2020
4 of 5 checks passed
4 of 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... 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.