[Scummvm-git-logs] scummvm master -> 6848116b9cf0362f4c498013951b2a52c83a3ebc

eriktorbjorn noreply at scummvm.org
Thu Nov 23 14:23:53 UTC 2023


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:
6848116b9c SCUMM: Remove unnecessary calls to mac_drawIndy3TextBox()


Commit: 6848116b9cf0362f4c498013951b2a52c83a3ebc
    https://github.com/scummvm/scummvm/commit/6848116b9cf0362f4c498013951b2a52c83a3ebc
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-23T15:23:20+01:00

Commit Message:
SCUMM: Remove unnecessary calls to mac_drawIndy3TextBox()

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 4bbb6699c93..f3e684f2716 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1186,9 +1186,6 @@ void ScummEngine::CHARSET_1() {
 		_nextLeft = _charset->_left;
 		_nextTop = _charset->_top;
 
-		if (drawTextBox)
-			mac_drawIndy3TextBox();
-
 		if (_game.version <= 2) {
 			_talkDelay += _defaultTextSpeed;
 			VAR(VAR_CHARCOUNT)++;
@@ -1197,6 +1194,9 @@ void ScummEngine::CHARSET_1() {
 		}
 	}
 
+	if (drawTextBox)
+		mac_drawIndy3TextBox();
+
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 	if (_game.platform == Common::kPlatformFMTowns && (c == 0 || c == 2 || c == 3))
 		memcpy(&_curStringRect, &_charset->_str, sizeof(Common::Rect));




More information about the Scummvm-git-logs mailing list