aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-03-09 19:33:28 +0100
committerStrangerke2014-03-09 19:33:28 +0100
commit2dac5b76b0646a9e1e09790614fd39c5c5c8ed07 (patch)
tree5fd58dc7bae5a06f5140f334f5adec3f384ec7fc /engines
parentc72927bb8627a56b499a0b52a19ae9ef4a384dfe (diff)
downloadscummvm-rg350-2dac5b76b0646a9e1e09790614fd39c5c5c8ed07.tar.gz
scummvm-rg350-2dac5b76b0646a9e1e09790614fd39c5c5c8ed07.tar.bz2
scummvm-rg350-2dac5b76b0646a9e1e09790614fd39c5c5c8ed07.zip
VOYEUR: Remove useless VoyeurEngine pointer in SoundManager
Diffstat (limited to 'engines')
-rw-r--r--engines/voyeur/sound.cpp2
-rw-r--r--engines/voyeur/sound.h3
-rw-r--r--engines/voyeur/voyeur.cpp2
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/voyeur/sound.cpp b/engines/voyeur/sound.cpp
index ae10b2d4d9..26145bd743 100644
--- a/engines/voyeur/sound.cpp
+++ b/engines/voyeur/sound.cpp
@@ -28,7 +28,7 @@
namespace Voyeur {
- SoundManager::SoundManager(VoyeurEngine *vm, Audio::Mixer *mixer) : _vm(vm) {
+ SoundManager::SoundManager(Audio::Mixer *mixer) {
_mixer = mixer;
_vocOffset = 0;
}
diff --git a/engines/voyeur/sound.h b/engines/voyeur/sound.h
index fc2d3047eb..af1d0b1b46 100644
--- a/engines/voyeur/sound.h
+++ b/engines/voyeur/sound.h
@@ -33,12 +33,11 @@ namespace Voyeur {
class SoundManager {
private:
- VoyeurEngine *_vm;
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
int _vocOffset;
public:
- SoundManager(VoyeurEngine *vm, Audio::Mixer *mixer);
+ SoundManager(Audio::Mixer *mixer);
void playVOCMap(byte *voc, int vocSize);
void stopVOCPlay();
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 0406ba089a..e32ceefb00 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -71,7 +71,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
_eventsManager = new EventsManager(this);
_filesManager = new FilesManager(this);
_graphicsManager = new GraphicsManager(this);
- _soundManager = new SoundManager(this, _mixer);
+ _soundManager = new SoundManager(_mixer);
_voy = new SVoy(this);
}