SCUMM: Fix encoding of some message dialogs with original_gui=false#6577
Merged
bluegr merged 1 commit intoscummvm:masterfrom May 1, 2025
Merged
Conversation
In the `original_gui=false` code paths, queryResString() -- itself calling getDialogCodePage() -- is never called, and so proper decoding support was incomplete. Fixes Ctrl-V output in ScummVM's own UI with French DOTT.
Member
|
Nice work, thanks! I've also talked with @AndywinXp, and the changes look good for him as well Merging |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes Ctrl-V output with French DOTT, when using
original_gui=false. Theçcharacter was not displayed at all, when using ScummVM's own UI for dialogs.The
original_gui=truecode path is OK, because it callsqueryResString(), which takes care of callinggetDialogCodePage().But the
original_gui=falsecode path never callsqueryResString()/getDialogCodePage()and so the proper code page decoding was not applied.I'm not sure this fix is enough, though: maybe the
original_gui=falsepath would need more of that stuff being done in the last parts ofqueryResString()? It's not a part I know very well…