[Scummvm-git-logs] scummvm master -> 4cbf47e569973b7a3a7181dd1a259026947ef2c7

[digitall]

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:
4cbf47e569 SAGA2: Fix Template Expansion of MAX() in NDS Build


Commit: 4cbf47e569973b7a3a7181dd1a259026947ef2c7
    https://github.com/scummvm/scummvm/commit/4cbf47e569973b7a3a7181dd1a259026947ef2c7
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-01T05:45:58+01:00

Commit Message:
SAGA2: Fix Template Expansion of MAX() in NDS Build

Changed paths:
    engines/saga2/intrface.cpp


diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index 5f080a3ea7..d2f2f6ca24 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -1412,7 +1412,7 @@ void CHealthIndicator::updateStar(gCompImage *starCtl, int32 bro, int32 baseVita
 
 	maxStar = clamp(0, baseVitality / 10 + 14, starLevels - 1);
 //	imageIndex = (int16)( sqrt( sqrt( (double)curVitality ) ) * maxStar) / sqrt( sqrt( (double)baseVitality ) );
-	imageIndex = (int16)(sqrt((double)MAX(0, curVitality)) * maxStar) / sqrt((double)baseVitality);
+	imageIndex = (int16)(sqrt((double)MAX((int32)0, curVitality)) * maxStar) / sqrt((double)baseVitality);
 
 	// prevent needless draws
 	if (imageIndexMemory[bro] != imageIndex) {