NEVERHOOD: Change sound stuff in Module2700

2 files changed, 6 insertions, 24 deletions

diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
index aa5c98e4c2..0a59abf0f2 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/module2700.cpp
@@ -83,8 +83,7 @@ static const uint32 kScene2725StaticSprites[] = {
 };
 
 Module2700::Module2700(NeverhoodEngine *vm, Module *parentModule, int which)
-	: Module(vm, parentModule), _soundResource1(vm), _soundResource2(vm),
-	_soundResource3(vm), _soundResource4(vm), _soundIndex(0), _flag1(false) {
+	: Module(vm, parentModule), _soundIndex(0), _flag1(false) {
 	
 	_vm->_soundMan->addMusic(0x42212411, 0x04020210);
 	_vm->_soundMan->startMusic(0x04020210, 24, 2);
@@ -99,10 +98,10 @@ Module2700::Module2700(NeverhoodEngine *vm, Module *parentModule, int which)
 		createScene(0, 0);
 	}
 
-	_soundResource1.load(0x00880CCC);
-	_soundResource2.load(0x00880CC0);
-	_soundResource3.load(0x00880CCC);
-	_soundResource4.load(0x00880CC0);
+	loadSound(0, 0x00880CCC);
+	loadSound(1, 0x00880CC0);
+	loadSound(2, 0x00880CCC);
+	loadSound(3, 0x00880CC0);
 
 }
 
@@ -482,20 +481,7 @@ uint32 Module2700::handleMessage(int messageNum, const MessageParam &param, Enti
 	uint32 messageResult = Module::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x200D:
-		switch (_soundIndex) {
-		case 0:
-			_soundResource1.play();
-			break;
-		case 1:
-			_soundResource2.play();
-			break;
-		case 2:
-			_soundResource3.play();
-			break;
-		case 3:
-			_soundResource4.play();
-			break;
-		}
+		playSound(_soundIndex);
 		_soundIndex++;
 		if (_soundIndex >= 4)
 			_soundIndex = 0;
diff --git a/engines/neverhood/module2700.h b/engines/neverhood/module2700.h
index bed9a7d829..70c1a802bb 100644
--- a/engines/neverhood/module2700.h
+++ b/engines/neverhood/module2700.h
@@ -37,10 +37,6 @@ public:
 	Module2700(NeverhoodEngine *vm, Module *parentModule, int which);
 	virtual ~Module2700();
 protected:
-	SoundResource _soundResource1;
-	SoundResource _soundResource2;
-	SoundResource _soundResource3;
-	SoundResource _soundResource4;
 	int _soundIndex;
 	bool _flag1;
 	uint32 _scene2711StaticSprites[6];