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

[lskovlun]

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:
ca623ff490 SCI: Fix compilation on amigaos4


Commit: ca623ff49073c76915a769bbbea94cb1a1e4dd25
    https://github.com/scummvm/scummvm/commit/ca623ff49073c76915a769bbbea94cb1a1e4dd25
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2016-02-29T20:16:37+01:00

Commit Message:
SCI: Fix compilation on amigaos4

Changed paths:
    engines/sci/console.cpp



diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index f271bed..450ca13 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3951,8 +3951,8 @@ bool Console::cmdMapVocab994(int argc, const char **argv) {
 	if (!obj->isClass() && getSciVersion() != SCI_VERSION_3)
 		obj = s->_segMan->getObject(obj->getSuperClassSelector());
 
-	first = MIN(first, resource->size / 2 - 2);
-	last =  MIN(last, resource->size / 2 - 2);
+	first = MIN(first, (unsigned int) (resource->size / 2 - 2));
+	last =  MIN(last, (unsigned int) (resource->size / 2 - 2));
 
 	for (unsigned int i = first; i <= last; ++i)
 	{