Thanks to visit codestin.com
Credit goes to github.com

Skip to content

EMI: Show subtitles of judges during Marco's dive - #6994

Merged
aquadran merged 1 commit into
scummvm:masterfrom
chkr-private:actor-subtitle-fix
Nov 14, 2025
Merged

EMI: Show subtitles of judges during Marco's dive#6994
aquadran merged 1 commit into
scummvm:masterfrom
chkr-private:actor-subtitle-fix

Conversation

@chkr-private

Copy link
Copy Markdown
Contributor
  • when Marco dives and one of the judges announces the dive combination, the subtitles are currently not displayed
  • that happens because the judge actor's _visible variable is true, "isInSet()" returns true as well and so _mustPlaceText is set to true
  • because of that, TextObject::setText is called with delaySetup = true which causes the setting of the textobject's _lines to be postponed
  • since the actor's EffectiveSortOrder is -1, its draw() method is never called, the text object is never placed, its _lines stay empty and the text is never drawn
  • this commit fixes the issue by not setting _mustPlaceText when the actor's effective sort order is < 0

- when Marco dives and one of the judges announces the
  dive combination, the subtitles are currently not displayed
- that happens because the judge actor's _visible variable is true,
  "isInSet()" returns true as well and so _mustPlaceText is set to true
- because of that, TextObject::setText is called with
  delaySetup = true which causes the setting of the
  textobject's _lines to be postponed
- since the actor's EffectiveSortOrder is -1, its draw() method
  is never called, the text object is never placed, its _lines stay
  empty and the text is never drawn
- this commit fixes the issue by not setting _mustPlaceText
  when the actor's effective sort order is < 0
@aquadran

Copy link
Copy Markdown
Member

preferable merge after branch off as common with Grim Fandango

@aquadran
aquadran merged commit d4c9ca8 into scummvm:master Nov 14, 2025
1 check 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