diff options
| author | Einar Johan Trøan Sømåen | 2012-07-23 01:28:42 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-23 01:30:11 +0200 |
| commit | d1f7730ec25b409f3651167640dd48b7dd8046be (patch) | |
| tree | 09acde0f33697153c91bd4f3044f5ef1dc29e830 /engines/wintermute/ui | |
| parent | 93864d4e39f6335684bee9d8dc291ce9af32ca7b (diff) | |
| download | scummvm-rg350-d1f7730ec25b409f3651167640dd48b7dd8046be.tar.gz scummvm-rg350-d1f7730ec25b409f3651167640dd48b7dd8046be.tar.bz2 scummvm-rg350-d1f7730ec25b409f3651167640dd48b7dd8046be.zip | |
WINTERMUTE: Encapsulate BaseRenderer::_rectList and replace it by Common::Array
Diffstat (limited to 'engines/wintermute/ui')
| -rw-r--r-- | engines/wintermute/ui/ui_button.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index 2c4f6d5e4e..21a60ef922 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -637,7 +637,7 @@ bool UIButton::display(int offsetX, int offsetY) { font->drawText((byte *)_text, offsetX + _posX + ((_press || _oneTimePress) ? 1 : 0), offsetY + _posY + text_offset + ((_press || _oneTimePress) ? 1 : 0), _width, _align);
}
- if (!_pixelPerfect || !_image) _gameRef->_renderer->_rectList.add(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
+ if (!_pixelPerfect || !_image) _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
// reset unused sprites
if (_image && _image != image) _image->reset();
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index 8c277e7c87..df3bd85bb8 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -672,7 +672,7 @@ bool UIEdit::display(int offsetX, int offsetY) { }
- _gameRef->_renderer->_rectList.add(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
+ _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
_gameRef->_textEncoding = OrigEncoding;
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 7e6986508b..1f7dc0bee9 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -190,7 +190,7 @@ bool UIWindow::display(int offsetX, int offsetY) { }
if (!_transparent && !image)
- _gameRef->_renderer->_rectList.add(new BaseActiveRect(_gameRef, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false));
+ _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false));
for (int i = 0; i < _widgets.getSize(); i++) {
_widgets[i]->display(_posX + offsetX, _posY + offsetY);
|