[Scummvm-git-logs] scummvm master -> 2caa965b309c54a2eb9c40f96299249442276be3

SupSuper supsuper at gmail.com
Fri Jun 11 22:16:28 UTC 2021


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:
2caa965b30 TRECISION: Fix subtitle crash


Commit: 2caa965b309c54a2eb9c40f96299249442276be3
    https://github.com/scummvm/scummvm/commit/2caa965b309c54a2eb9c40f96299249442276be3
Author: SupSuper (supsuper at gmail.com)
Date: 2021-06-11T23:15:31+01:00

Commit Message:
TRECISION: Fix subtitle crash

SDText::calcHeight uses _rect so we have to reset it one at a time

Changed paths:
    engines/trecision/video.cpp


diff --git a/engines/trecision/video.cpp b/engines/trecision/video.cpp
index a323cf52e6..3b74377486 100644
--- a/engines/trecision/video.cpp
+++ b/engines/trecision/video.cpp
@@ -218,7 +218,10 @@ void AnimManager::drawFrameSubtitles(Graphics::Surface *surface, int frameNum) {
 	// Subtitles can be placed in different coordinates in the video,
 	// which are set inside dialogHandler(), but are then reset to
 	// fixed coordinates
-	_vm->_drawText._rect = Common::Rect(20, 380 - TOP, MAXX - 40 + 20, _vm->_drawText.calcHeight(_vm) + (380 - TOP));
+	_vm->_drawText._rect.left = 20;
+	_vm->_drawText._rect.top = 380 - TOP;
+	_vm->_drawText._rect.setWidth(MAXX - 40);
+	_vm->_drawText._rect.setHeight(_vm->_drawText.calcHeight(_vm));
 	_vm->_drawText._subtitleRect = Common::Rect(MAXX, MAXY);
 	_vm->_drawText.draw(_vm, false, surface);
 }




More information about the Scummvm-git-logs mailing list