diff options
| author | Torbjörn Andersson | 2005-04-05 16:33:38 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-04-05 16:33:38 +0000 |
| commit | ed131fdad1a7d614c2d7c901fdf226fc7b6c38b9 (patch) | |
| tree | 0dc1dbe9b89f908c3ac5c855e5425779c8c819e7 /gob | |
| parent | 3eddcd5da5969a807beb63a94d543882fc24ade5 (diff) | |
| download | scummvm-rg350-ed131fdad1a7d614c2d7c901fdf226fc7b6c38b9.tar.gz scummvm-rg350-ed131fdad1a7d614c2d7c901fdf226fc7b6c38b9.tar.bz2 scummvm-rg350-ed131fdad1a7d614c2d7c901fdf226fc7b6c38b9.zip | |
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)'.
svn-id: r17395
Diffstat (limited to 'gob')
| -rw-r--r-- | gob/scenery.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gob/scenery.cpp b/gob/scenery.cpp index c42f3e879d..f6b13ebebc 100644 --- a/gob/scenery.cpp +++ b/gob/scenery.cpp @@ -520,10 +520,10 @@ void scen_updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, 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 @@ void scen_updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, 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); |