[Scummvm-git-logs] scummvm master -> 25426c0a80d28844112370383697527d535620eb

[lephilousophe]

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:
25426c0a80 MACGUI: Fix int/int32 build failures


Commit: 25426c0a80d28844112370383697527d535620eb
    https://github.com/scummvm/scummvm/commit/25426c0a80d28844112370383697527d535620eb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-05T23:54:34+02:00

Commit Message:
MACGUI: Fix int/int32 build failures

All of this is because Rect and Surface have moved to int32

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 407637e728..98e382cdab 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1123,7 +1123,7 @@ void MacText::appendText_(const Common::U32String &strWithFont, uint oldLen) {
 	_contentIsDirty = true;
 
 	if (_editable) {
-		_scrollPos = MAX(0, getTextHeight() - getDimensions().height());
+		_scrollPos = MAX<int>(0, getTextHeight() - getDimensions().height());
 
 		_cursorRow = getLineCount();
 		_cursorCol = getLineCharWidth(_cursorRow);
@@ -1749,7 +1749,7 @@ void MacText::scroll(int delta) {
 	if (_editable)
 		_scrollPos = CLIP<int>(_scrollPos, 0, MacText::getTextHeight() - kConScrollStep);
 	else
-		_scrollPos = CLIP<int>(_scrollPos, 0, MAX(0, MacText::getTextHeight() - getDimensions().height()));
+		_scrollPos = CLIP<int>(_scrollPos, 0, MAX<int>(0, MacText::getTextHeight() - getDimensions().height()));
 
 	undrawCursor();
 	_cursorY -= (_scrollPos - oldScrollPos);
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 399f2f854d..b139c05648 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -131,7 +131,7 @@ void MacTextWindow::appendText(const Common::U32String &str, const MacFont *macF
 	_inputIsDirty = true;	//force it to redraw input
 
 	if (_editable) {
-		_scrollPos = MAX(0, _mactext->getTextHeight() - getInnerDimensions().height());
+		_scrollPos = MAX<int>(0, _mactext->getTextHeight() - getInnerDimensions().height());
 
 		updateCursorPos();
 	}
@@ -536,7 +536,7 @@ void MacTextWindow::scroll(int delta) {
 	if (_editable)
 		_scrollPos = CLIP<int>(_scrollPos, 0, _mactext->getTextHeight() - kConScrollStep);
 	else
-		_scrollPos = CLIP<int>(_scrollPos, 0, MAX(0, _mactext->getTextHeight() - getInnerDimensions().height()));
+		_scrollPos = CLIP<int>(_scrollPos, 0, MAX<int>(0, _mactext->getTextHeight() - getInnerDimensions().height()));
 
 	undrawCursor();
 	_cursorY -= (_scrollPos - oldScrollPos);