diff options
author | Colin Snover | 2016-08-26 20:06:00 -0500 |
---|---|---|
committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
commit | 3cf16c0a7f9731a88914531392628b2dc599d787 (patch) | |
tree | 1aa980305f0ca7d0c817dc34ffe9216428bb9093 /engines/sci/engine/kvideo.cpp | |
parent | d0517f515eb7f36ec7222f3d50f4917fbd7df5e7 (diff) | |
download | scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.tar.gz scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.tar.bz2 scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.zip |
SCI32: Explicitly instantiate MIN/MAX templates
Diffstat (limited to 'engines/sci/engine/kvideo.cpp')
-rw-r--r-- | engines/sci/engine/kvideo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index b539c84f5d..46829cceef 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -446,10 +446,10 @@ reg_t kPlayVMDSetBlackoutArea(EngineState *s, int argc, reg_t *argv) { const int16 scriptHeight = g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight; Common::Rect blackoutArea; - blackoutArea.left = MAX((int16)0, argv[0].toSint16()); - blackoutArea.top = MAX((int16)0, argv[1].toSint16()); - blackoutArea.right = MIN(scriptWidth, (int16)(argv[2].toSint16() + 1)); - blackoutArea.bottom = MIN(scriptHeight, (int16)(argv[3].toSint16() + 1)); + blackoutArea.left = MAX<int16>(0, argv[0].toSint16()); + blackoutArea.top = MAX<int16>(0, argv[1].toSint16()); + blackoutArea.right = MIN<int16>(scriptWidth, argv[2].toSint16() + 1); + blackoutArea.bottom = MIN<int16>(scriptHeight, argv[3].toSint16() + 1); g_sci->_video32->getVMDPlayer().setBlackoutArea(blackoutArea); return s->r_acc; } |