From ba991fe7021df572fd003ddda2f7f090081fd299 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Mon, 24 Sep 2012 11:15:34 +0000
Subject: NEVERHOOD: Fix addSound in AsScene2609Water and add a destructor

---
 engines/neverhood/module2600.cpp | 6 +++++-
 engines/neverhood/module2600.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/neverhood')

diff --git a/engines/neverhood/module2600.cpp b/engines/neverhood/module2600.cpp
index 7cdfb69ed8..43c55ea49b 100644
--- a/engines/neverhood/module2600.cpp
+++ b/engines/neverhood/module2600.cpp
@@ -277,13 +277,17 @@ AsScene2609Water::AsScene2609Water(NeverhoodEngine *vm)
 	setDoDeltaX(1);
 	createSurface1(0x9C210C90, 1200);
 	setClipRect(260, 260, 400, 368);
-	_vm->_soundMan->addSound(0xDC2769B0, true);
+	_vm->_soundMan->addSound(0x08526C36, 0xDC2769B0);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsScene2609Water::handleMessage);
 	if (getGlobalVar(0x4E0BE910))
 		sendMessage(this, 0x2002, 0);
 }
 
+AsScene2609Water::~AsScene2609Water() {
+	_vm->_soundMan->deleteSoundGroup(0x08526C36);
+}
+
 uint32 AsScene2609Water::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
diff --git a/engines/neverhood/module2600.h b/engines/neverhood/module2600.h
index d6580a6c7a..04c78008f0 100644
--- a/engines/neverhood/module2600.h
+++ b/engines/neverhood/module2600.h
@@ -57,6 +57,7 @@ protected:
 class AsScene2609Water : public AnimatedSprite {
 public:
 	AsScene2609Water(NeverhoodEngine *vm);
+	virtual ~AsScene2609Water();
 protected:
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
-- 
cgit v1.2.3