diff options
| author | Torbjörn Andersson | 2016-07-04 06:52:37 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2016-07-04 06:52:37 +0200 |
| commit | fad29cf071a081cf448e1eaa926e8fd4a3712aaf (patch) | |
| tree | 60f9feb3204b2597659452b857c2ba6b46949a06 /engines/bbvs | |
| parent | 9020002c78e8f3169d82e5dfe124f3192aa2a7ca (diff) | |
| download | scummvm-rg350-fad29cf071a081cf448e1eaa926e8fd4a3712aaf.tar.gz scummvm-rg350-fad29cf071a081cf448e1eaa926e8fd4a3712aaf.tar.bz2 scummvm-rg350-fad29cf071a081cf448e1eaa926e8fd4a3712aaf.zip | |
BBVS: Remove some uses of g_system
Diffstat (limited to 'engines/bbvs')
| -rw-r--r-- | engines/bbvs/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/bbvs/saveload.cpp | 6 | ||||
| -rw-r--r-- | engines/bbvs/videoplayer.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/bbvs/dialogs.cpp b/engines/bbvs/dialogs.cpp index 1609794c73..64fa86e1ee 100644 --- a/engines/bbvs/dialogs.cpp +++ b/engines/bbvs/dialogs.cpp @@ -95,8 +95,8 @@ void MainMenu::init() { } void MainMenu::reflowLayout() { - const int screenW = g_system->getOverlayWidth(); - const int screenH = g_system->getOverlayHeight(); + const int screenW = _vm->_system->getOverlayWidth(); + const int screenH = _vm->_system->getOverlayHeight(); const int buttonWidth = screenW * 70 / 320; const int buttonHeight = screenH * 14 / 240; diff --git a/engines/bbvs/saveload.cpp b/engines/bbvs/saveload.cpp index e7725713fd..79afd112be 100644 --- a/engines/bbvs/saveload.cpp +++ b/engines/bbvs/saveload.cpp @@ -59,13 +59,13 @@ BbvsEngine::kReadSaveHeaderError BbvsEngine::readSaveHeader(Common::SeekableRead void BbvsEngine::savegame(const char *filename, const char *description) { Common::OutSaveFile *out; - if (!(out = g_system->getSavefileManager()->openForSaving(filename))) { + if (!(out = _system->getSavefileManager()->openForSaving(filename))) { warning("Can't create file '%s', game not saved", filename); return; } TimeDate curTime; - g_system->getTimeAndDate(curTime); + _system->getTimeAndDate(curTime); // Header start out->writeUint32LE(BBVS_SAVEGAME_VERSION); @@ -95,7 +95,7 @@ void BbvsEngine::savegame(const char *filename, const char *description) { void BbvsEngine::loadgame(const char *filename) { Common::InSaveFile *in; - if (!(in = g_system->getSavefileManager()->openForLoading(filename))) { + if (!(in = _system->getSavefileManager()->openForLoading(filename))) { warning("Can't open file '%s', game not loaded", filename); return; } diff --git a/engines/bbvs/videoplayer.cpp b/engines/bbvs/videoplayer.cpp index 1b721c434f..9bef02a3cc 100644 --- a/engines/bbvs/videoplayer.cpp +++ b/engines/bbvs/videoplayer.cpp @@ -73,7 +73,7 @@ void BbvsEngine::playVideo(int videoNum) { } Common::Event event; - while (g_system->getEventManager()->pollEvent(event)) { + while (_system->getEventManager()->pollEvent(event)) { if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP) skipVideo = true; |