diff options
| author | Einar Johan Trøan Sømåen | 2013-04-18 11:13:32 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-18 11:13:32 +0200 |
| commit | a8f4f20f38bd577ae9b63a15dec7416523de2b16 (patch) | |
| tree | e8e62334367f87a2dc0823581d152b69a9e37181 /engines/wintermute/base/base_frame.cpp | |
| parent | 4783d643f6f6546c073dfba96f73b35c931b54ea (diff) | |
| download | scummvm-rg350-a8f4f20f38bd577ae9b63a15dec7416523de2b16.tar.gz scummvm-rg350-a8f4f20f38bd577ae9b63a15dec7416523de2b16.tar.bz2 scummvm-rg350-a8f4f20f38bd577ae9b63a15dec7416523de2b16.zip | |
WINTERMUTE: Avoid including BaseGame in BaseFrame.
Diffstat (limited to 'engines/wintermute/base/base_frame.cpp')
| -rw-r--r-- | engines/wintermute/base/base_frame.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index 8a190c729b..382e8acbe0 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -27,8 +27,9 @@ */ #include "engines/wintermute/base/base_parser.h" +#include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/base/base_frame.h" -#include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_object.h" #include "engines/wintermute/base/base_dynamic_buffer.h" #include "engines/wintermute/base/sound/base_sound_manager.h" #include "engines/wintermute/base/sound/base_sound.h" @@ -264,8 +265,8 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { } _sound = new BaseSound(_gameRef); if (!_sound || DID_FAIL(_sound->setSound(params, Audio::Mixer::kSFXSoundType, false))) { - if (_gameRef->_soundMgr->_soundAvailable) { - _gameRef->LOG(0, "Error loading sound '%s'.", params); + if (BaseEngine::instance().getSoundMgr()->_soundAvailable) { + BaseEngine::LOG(0, "Error loading sound '%s'.", params); } delete _sound; _sound = nullptr; @@ -294,12 +295,12 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { } } if (cmd == PARSERR_TOKENNOTFOUND) { - _gameRef->LOG(0, "Syntax error in FRAME definition"); + BaseEngine::LOG(0, "Syntax error in FRAME definition"); return STATUS_FAILED; } if (cmd == PARSERR_GENERIC) { - _gameRef->LOG(0, "Error loading FRAME definition"); + BaseEngine::LOG(0, "Error loading FRAME definition"); return STATUS_FAILED; } @@ -314,7 +315,7 @@ bool BaseFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) { if (!sub->_surface) { delete sub; - _gameRef->LOG(0, "Error loading SUBFRAME"); + BaseEngine::LOG(0, "Error loading SUBFRAME"); return STATUS_FAILED; } |