[Scummvm-cvs-logs] scummvm master -> b97edfcbe0f53f0d6416c25128647441f0ff50b6

[somaen]

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:
b97edfcbe0 WINTERMUTE: Fix the final int->int32 to allow AmigaOS4-compile.


Commit: b97edfcbe0f53f0d6416c25128647441f0ff50b6
    https://github.com/scummvm/scummvm/commit/b97edfcbe0f53f0d6416c25128647441f0ff50b6
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-20T15:24:02-07:00

Commit Message:
WINTERMUTE: Fix the final int->int32 to allow AmigaOS4-compile.

Changed paths:
    engines/wintermute/ad/ad_object.cpp



diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index b01caf6..741d6e6 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -941,7 +941,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
 
 	// set duration by text length
 	if (_sentence->_duration <= 0) {// TODO: Avoid longs.
-		_sentence->_duration = MAX((size_t)1000, _gameRef->_subtitlesSpeed * strlen(_sentence->_text));
+		_sentence->_duration = MAX<int32>((size_t)1000, _gameRef->_subtitlesSpeed * strlen(_sentence->_text));
 	}