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

DIRECTOR: Fixes for D5 support #6420

Merged
merged 34 commits into from
Feb 4, 2025
Merged

Conversation

moralrecordings
Copy link
Contributor

No description provided.

Copy link
Member

@sev- sev- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff. I have one question.

Also, you forgot to commit lingo-gr.cpp/.h and lingo-lex.cpp/.h


if (name.contains(" Bold") || name.equalsIgnoreCase("Bold"))
Copy link
Member

@sev- sev- Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these " <slant>" checks were removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The checks have been refactored (there was a typo where name was used instead of subName, which is now fixed). Real Director expects a comma-separated list of case-insensitive slant types, which are applied incrementally. So you could have shadow,italic,plain,underline,bold, which resolves to the same thing as underline,bold.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tokenizer should split the string by either " " or "," characters so there's no need to check for spaces

Fixes crashes when starting a new game in Zeddas: Servant of Sheol.
Previously, using unsigned integers made it possible to overflow the
timeout check, as you can redefine the tick baseline (and therefore
the last timeout figure) via Lingo.

Fixes catching mice in The Great Green Mouse Disaster.
In D5, the castNum will return a multiplexed ID instead of just the
member ID, and various other features will accept and use the
multiplexed ID.

Fixes the story playback and basic navigation in Smarty.
Fixes display of text cards in Murphy's TV.
Fixes the language icons on the remote control in Murphy's TV.
@sev-
Copy link
Member

sev- commented Feb 4, 2025

Thank you!

@sev- sev- merged commit ffbefea into scummvm:master Feb 4, 2025
8 checks passed
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