aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ad/ad_object.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-04-20 18:11:47 +0200
committerEinar Johan Trøan Sømåen2013-04-20 18:11:47 +0200
commit51e17d9f86d9063dd98924046c78ad23946b4ae9 (patch)
treeeadc51a3321f5ec7d1421201d12066691d647edb /engines/wintermute/ad/ad_object.cpp
parent2625f3931a946180de617fa0e04b8b4d3f30cb2d (diff)
downloadscummvm-rg350-51e17d9f86d9063dd98924046c78ad23946b4ae9.tar.gz
scummvm-rg350-51e17d9f86d9063dd98924046c78ad23946b4ae9.tar.bz2
scummvm-rg350-51e17d9f86d9063dd98924046c78ad23946b4ae9.zip
WINTERMUTE: Further reduce the amount of int->int32-confusion.
Diffstat (limited to 'engines/wintermute/ad/ad_object.cpp')
-rw-r--r--engines/wintermute/ad/ad_object.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 6f9c85d3b5..b01caf6b2c 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -864,14 +864,14 @@ int AdObject::getHeight() {
return 0;
} else {
BaseFrame *frame = _currentSprite->_frames[_currentSprite->_currentFrame];
- int ret = 0;
+ int32 ret = 0;
for (uint32 i = 0; i < frame->_subframes.size(); i++) {
ret = MAX(ret, frame->_subframes[i]->_hotspotY);
}
if (_zoomable) {
float zoom = ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY);
- ret = (int)(ret * zoom / 100);
+ ret = (int32)(ret * zoom / 100);
}
return ret;
}
@@ -945,7 +945,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
}
- int x, y, width, height;
+ int32 x, y, width, height;
x = _posX;
y = _posY;
@@ -981,8 +981,8 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
}
- x = MIN(MAX(0, x), _gameRef->_renderer->getWidth() - width);
- y = MIN(MAX(0, y), _gameRef->_renderer->getHeight() - height);
+ x = MIN(MAX<int32>(0, x), _gameRef->_renderer->getWidth() - width);
+ y = MIN(MAX<int32>(0, y), _gameRef->_renderer->getHeight() - height);
_sentence->_width = width;