diff options
| author | Einar Johan Trøan Sømåen | 2013-04-20 18:11:47 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-20 18:11:47 +0200 |
| commit | 51e17d9f86d9063dd98924046c78ad23946b4ae9 (patch) | |
| tree | eadc51a3321f5ec7d1421201d12066691d647edb /engines/wintermute/ad/ad_sentence.cpp | |
| parent | 2625f3931a946180de617fa0e04b8b4d3f30cb2d (diff) | |
| download | scummvm-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_sentence.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_sentence.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp index 196a7acd0b..70a57a624d 100644 --- a/engines/wintermute/ad/ad_sentence.cpp +++ b/engines/wintermute/ad/ad_sentence.cpp @@ -204,8 +204,8 @@ bool AdSentence::display() { } if (_gameRef->_subtitles) { - int x = _pos.x; - int y = _pos.y; + int32 x = _pos.x; + int32 y = _pos.y; if (!_fixedPos) { x = x - ((AdGame *)_gameRef)->_scene->getOffsetLeft(); @@ -213,9 +213,9 @@ bool AdSentence::display() { } - x = MAX(x, 0); + x = MAX<int32>(x, 0); x = MIN(x, _gameRef->_renderer->getWidth() - _width); - y = MAX(y, 0); + y = MAX<int32>(y, 0); _font->drawText((byte *)_text, x, y, _width, _align); } |