diff options
author | Max Horn | 2007-03-17 00:39:18 +0000 |
---|---|---|
committer | Max Horn | 2007-03-17 00:39:18 +0000 |
commit | a6f3ed8173a0490855df84e955229c9f77ecf9c2 (patch) | |
tree | a6167cd37896d27072579ea0cd6ede23ba218aa7 /engines/lure/surface.cpp | |
parent | 8fc8c4847df493de85736447c1c8d9528a9b1299 (diff) | |
download | scummvm-rg350-a6f3ed8173a0490855df84e955229c9f77ecf9c2.tar.gz scummvm-rg350-a6f3ed8173a0490855df84e955229c9f77ecf9c2.tar.bz2 scummvm-rg350-a6f3ed8173a0490855df84e955229c9f77ecf9c2.zip |
Got rid of Lure::System
svn-id: r26155
Diffstat (limited to 'engines/lure/surface.cpp')
-rw-r--r-- | engines/lure/surface.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index 54292ac460..bd8a5e4359 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -22,7 +22,6 @@ #include "lure/surface.h" #include "lure/decode.h" -#include "lure/system.h" #include "lure/events.h" #include "lure/screen.h" #include "lure/lure.h" @@ -273,13 +272,13 @@ void Surface::createDialog(bool blackFlag) { } void Surface::copyToScreen(uint16 x, uint16 y) { - OSystem &system = System::getReference(); + OSystem &system = *g_system; system.copyRectToScreen(_data->data(), _width, x, y, _width, _height); system.updateScreen(); } void Surface::centerOnScreen() { - OSystem &system = System::getReference(); + OSystem &system = *g_system; system.copyRectToScreen(_data->data(), _width, (FULL_SCREEN_WIDTH - _width) / 2, (FULL_SCREEN_HEIGHT - _height) / 2, @@ -389,7 +388,7 @@ Surface *Surface::getScreen(uint16 resourceId) { } bool Surface::getString(Common::String &line, uint32 maxSize, bool isNumeric, bool varLength, int16 x, int16 y) { - OSystem &system = System::getReference(); + OSystem &system = *g_system; Mouse &mouse = Mouse::getReference(); Events &events = Events::getReference(); Screen &screen = Screen::getReference(); @@ -623,7 +622,7 @@ void SaveRestoreDialog::toggleHightlight(int xs, int xe, int ys, int ye) { } bool SaveRestoreDialog::show(bool saveDialog) { - OSystem &system = System::getReference(); + OSystem &system = *g_system; Screen &screen = Screen::getReference(); Mouse &mouse = Mouse::getReference(); Events &events = Events::getReference(); |