[Scummvm-cvs-logs] CVS: scummvm/gob scenery.cpp,1.1,1.2

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19955

Modified Files:
	scenery.cpp 
Log Message:
This change does not make sense to me, but GCC was screaming bloody murder
about not being able to find a matching call for `MAX(int16&, int)'.


Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scenery.cpp	5 Apr 2005 15:07:39 -0000	1.1
+++ scenery.cpp	5 Apr 2005 16:33:38 -0000	1.2
@@ -520,10 +520,10 @@
 		    MAX(scen_toRedrawTop, anim_animAreaTop);
 		scen_toRedrawRight =
 		    MIN(scen_toRedrawRight,
-		    anim_animAreaLeft + anim_animAreaWidth - 1);
+		    (int16)(anim_animAreaLeft + anim_animAreaWidth - 1));
 		scen_toRedrawBottom =
 		    MIN(scen_toRedrawBottom,
-		    anim_animAreaTop + anim_animAreaHeight - 1);
+		    (int16)(anim_animAreaTop + anim_animAreaHeight - 1));
 	}
 
 	transp = layerPtr->transp ? 3 : 0;
@@ -651,10 +651,10 @@
 				    MIN(scen_toRedrawTop, destY);
 				scen_toRedrawRight =
 				    MAX(scen_toRedrawRight,
-				    destX + right - left);
+				    (int16)(destX + right - left));
 				scen_toRedrawBottom =
 				    MAX(scen_toRedrawBottom,
-				    destY + bottom - top);
+				    (int16)(destY + bottom - top));
 			}
 		}
 	} while (framePtr->notFinal == 1);