[Scummvm-git-logs] scummvm master -> d4c9ca8eab95108d76c2f7c80d9752177687083f

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
d4c9ca8eab EMI: Show subtitles of judges during Marco's dive


Commit: d4c9ca8eab95108d76c2f7c80d9752177687083f
    https://github.com/scummvm/scummvm/commit/d4c9ca8eab95108d76c2f7c80d9752177687083f
Author: Christian Krause (chkr at plauener.de)
Date: 2025-11-14T22:40:19+01:00

Commit Message:
EMI: Show subtitles of judges during Marco's dive

- 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

Changed paths:
    engines/grim/actor.cpp


diff --git a/engines/grim/actor.cpp b/engines/grim/actor.cpp
index 8be6aa43738..e235540b395 100644
--- a/engines/grim/actor.cpp
+++ b/engines/grim/actor.cpp
@@ -1267,7 +1267,7 @@ void Actor::sayLine(const char *msgId, bool background, float x, float y) {
 			textObject->setY(456);
 			g_grim->setMovieSubtitle(textObject);
 		} else {
-			if (_visible && isInSet(currSet->getName())) {
+			if (_visible && isInSet(currSet->getName()) && getEffectiveSortOrder() >= 0) {
 				_mustPlaceText = true;
 			} else {
 				_mustPlaceText = false;