diff options
| author | Einar Johan Trøan Sømåen | 2013-04-18 12:15:05 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-18 12:15:05 +0200 |
| commit | e5b210770418c46b30e01c2ae2ed5b3ebf9b3223 (patch) | |
| tree | 2e899de28d254d90aed34888cd8a3182eddbdee9 | |
| parent | 32ace5f9d204e746ab8503220749e194ab91508c (diff) | |
| download | scummvm-rg350-e5b210770418c46b30e01c2ae2ed5b3ebf9b3223.tar.gz scummvm-rg350-e5b210770418c46b30e01c2ae2ed5b3ebf9b3223.tar.bz2 scummvm-rg350-e5b210770418c46b30e01c2ae2ed5b3ebf9b3223.zip | |
WINTERMUTE: Avoid including BaseGame in BaseSoundManager.
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_manager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index e3f5fdcdec..f3e7bfb408 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -30,7 +30,6 @@ #include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/utils/path_util.h" #include "engines/wintermute/utils/string_util.h" -#include "engines/wintermute/base/base_game.h" #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/base/gfx/base_renderer.h" #include "engines/wintermute/base/sound/base_sound_buffer.h" @@ -123,7 +122,7 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M bool res = sound->loadFromFile(useFilename); if (DID_FAIL(res)) { - _gameRef->LOG(res, "Error loading sound '%s'", useFilename.c_str()); + BaseEngine::LOG(res, "Error loading sound '%s'", useFilename.c_str()); delete sound; return nullptr; } @@ -280,7 +279,7 @@ bool BaseSoundMgr::resumeAll() { ////////////////////////////////////////////////////////////////////////// float BaseSoundMgr::posToPan(int x, int y) { - float relPos = (float)x / ((float)_gameRef->_renderer->getWidth()); + float relPos = (float)x / ((float)BaseEngine::getRenderer()->getWidth()); float minPan = -0.7f; float maxPan = 0.7f; |