From e5b210770418c46b30e01c2ae2ed5b3ebf9b3223 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Thu, 18 Apr 2013 12:15:05 +0200 Subject: WINTERMUTE: Avoid including BaseGame in BaseSoundManager. --- engines/wintermute/base/sound/base_sound_manager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'engines/wintermute/base') 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; -- cgit v1.2.3