diff options
author | Matthew Hoops | 2010-04-19 20:28:36 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-04-19 20:28:36 +0000 |
commit | 001bca2d6cf6c211f1d1640a74c9f19d1ef7cca5 (patch) | |
tree | ae7630f6b47fa55095b3ac48b12effc808676dd8 /engines/mohawk/graphics.cpp | |
parent | e6b835bce449ea6dba2a23feef6de627c318bdf3 (diff) | |
download | scummvm-rg350-001bca2d6cf6c211f1d1640a74c9f19d1ef7cca5.tar.gz scummvm-rg350-001bca2d6cf6c211f1d1640a74c9f19d1ef7cca5.tar.bz2 scummvm-rg350-001bca2d6cf6c211f1d1640a74c9f19d1ef7cca5.zip |
Remove use of global constructors in Mohawk.
svn-id: r48731
Diffstat (limited to 'engines/mohawk/graphics.cpp')
-rw-r--r-- | engines/mohawk/graphics.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index a634cd1584..6c41f67d85 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -613,11 +613,11 @@ void RivenGraphics::showInventory() { // bool hasTrapBook = *_vm->matchVarToString("atrapbook") != 0; if (!hasCathBook) { - drawInventoryImage(101, atrusJournalRectSolo); + drawInventoryImage(101, g_atrusJournalRectSolo); } else { - drawInventoryImage(101, atrusJournalRect); - drawInventoryImage(102, cathJournalRect); - drawInventoryImage(100, trapBookRect); + drawInventoryImage(101, g_atrusJournalRect); + drawInventoryImage(102, g_cathJournalRect); + drawInventoryImage(100, g_trapBookRect); } _vm->_system->updateScreen(); @@ -648,12 +648,12 @@ void RivenGraphics::clearInventoryArea() { _vm->_system->unlockScreen(); } -void RivenGraphics::drawInventoryImage(uint16 id, Common::Rect rect) { +void RivenGraphics::drawInventoryImage(uint16 id, const Common::Rect *rect) { ImageData *imageData = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id)); Graphics::Surface *surface = imageData->getSurface(); delete imageData; - _vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect.left, rect.top, surface->w, surface->h); + _vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect->left, rect->top, surface->w, surface->h); surface->free(); delete surface; |