diff options
author | Einar Johan Trøan Sømåen | 2013-10-29 02:55:31 +0100 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-10-29 02:59:53 +0100 |
commit | d6b9d7de8f4bc8be34ef7456a89ee144172ca5b0 (patch) | |
tree | 9c5d5025bdff5681f7fe2030b496677d54625bc8 /engines/wintermute/base/font | |
parent | efb8031b3c38b8d7e2da73725eb60a35554d0508 (diff) | |
download | scummvm-rg350-d6b9d7de8f4bc8be34ef7456a89ee144172ca5b0.tar.gz scummvm-rg350-d6b9d7de8f4bc8be34ef7456a89ee144172ca5b0.tar.bz2 scummvm-rg350-d6b9d7de8f4bc8be34ef7456a89ee144172ca5b0.zip |
WINTERMUTE: Remove BasePlatform::setRect (replace with member-call)
Diffstat (limited to 'engines/wintermute/base/font')
-rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp | 3 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 2b5fe0d1ff..dd54e5eb3f 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -37,7 +37,6 @@ #include "engines/wintermute/base/base_frame.h" #include "engines/wintermute/base/base_sprite.h" #include "engines/wintermute/base/base_file_manager.h" -#include "engines/wintermute/platform_osystem.h" namespace Wintermute { @@ -253,7 +252,7 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) { tileWidth = _widths[c]; } - BasePlatform::setRect(&rect, col * _tileWidth, row * _tileHeight, col * _tileWidth + tileWidth, (row + 1)*_tileHeight); + rect.setRect(col * _tileWidth, row * _tileHeight, col * _tileWidth + tileWidth, (row + 1) * _tileHeight); bool handled = false; if (_sprite) { _sprite->getCurrentFrame(); diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 8f0484f99c..13e88f5734 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -34,7 +34,6 @@ #include "engines/wintermute/base/base_game.h" #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/utils/utils.h" -#include "engines/wintermute/platform_osystem.h" #include "engines/wintermute/wintermute.h" #include "graphics/fonts/ttf.h" #include "graphics/fontman.h" @@ -227,7 +226,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign // and paint it if (surface) { Rect32 rc; - BasePlatform::setRect(&rc, 0, 0, surface->getWidth(), surface->getHeight()); + rc.setRect(0, 0, surface->getWidth(), surface->getHeight()); for (uint32 i = 0; i < _layers.size(); i++) { uint32 color = _layers[i]->_color; uint32 origForceAlpha = renderer->_forceAlphaColor; |