Skip to content

SCUMM: Fix encoding of some message dialogs with original_gui=false #6577

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

Merged

Conversation

dwatteau
Copy link
Contributor

@dwatteau dwatteau commented Apr 27, 2025

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=true code path is OK, because it calls queryResString(), which takes care of calling getDialogCodePage().

But the original_gui=false code path never calls queryResString()/getDialogCodePage() and so the proper code page decoding was not applied.

I'm not sure this fix is enough, though: maybe the original_gui=false path would need more of that stuff being done in the last parts of queryResString()? It's not a part I know very well…

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.
@lephilousophe lephilousophe requested a review from AndywinXp April 28, 2025 19:05
@bluegr
Copy link
Member

bluegr commented May 1, 2025

Nice work, thanks!
Tried it, seems to work well :)

I've also talked with @AndywinXp, and the changes look good for him as well

Merging

@bluegr bluegr merged commit c190e91 into scummvm:master May 1, 2025
8 checks passed
@dwatteau dwatteau deleted the fix/scumm-fix-codepage-in-messagedialog branch May 1, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants