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

[AndywinXp]

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

Summary:
e0a105ba3c SCUMM: COMI: Remove unneeded hack in subtitles rendering


Commit: e0a105ba3c08e2958e3e9fc3024945a7fcb3634f
    https://github.com/scummvm/scummvm/commit/e0a105ba3c08e2958e3e9fc3024945a7fcb3634f
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-01T21:28:28+01:00

Commit Message:
SCUMM: COMI: Remove unneeded hack in subtitles rendering

It appears that I have properly fixed this somewhere else during
this year... Having this code in place would just reproduce the
issue I was originally trying to fix.

Changed paths:
    engines/scumm/string_v7.cpp


diff --git a/engines/scumm/string_v7.cpp b/engines/scumm/string_v7.cpp
index 7253bc77b96..76b0ef7143f 100644
--- a/engines/scumm/string_v7.cpp
+++ b/engines/scumm/string_v7.cpp
@@ -511,23 +511,6 @@ void ScummEngine_v7::restoreBlastTextsRects() {
 		return;
 
 	for (int i = 0; i < _blastTextRectsQueue; i++) {
-		// Did the camera X coordinate change (i.e. because of an override)?
-		// If so, adjust the rects.
-		// Please note this wasn't done on the original, but we handle things
-		// a little bit differently on our end, so we need to account for this
-		// case manually.
-		if (camera._cur.x != camera._last.x) {
-			int rightDiff = _blastTextQueue[i].rect.right - (camera._cur.x - camera._last.x);
-			int leftDiff = _blastTextQueue[i].rect.left - (camera._cur.x - camera._last.x);
-
-			// The nominal calculations are meant to be used for camera movements
-			// inside the same room. If this is not true, we might end up with
-			// negative rect values, so in that case the worse that can happen
-			// it's just that the rect will be as large as the screen itself.
-			_blastTextQueue[i].rect.left = (leftDiff < 0) ? 0 : leftDiff;
-			_blastTextQueue[i].rect.right = (rightDiff < 0) ? _screenWidth : rightDiff;
-		}
-
 		restoreBackground(_blastTextQueue[i].rect);
 	}