DREAMWEB: Move 'soundOnReels' out of dreamgen

4 files changed, 46 insertions, 46 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f089297df8..121ec5040a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1909,51 +1909,6 @@ hissnoise:
 	playChannel1();
 }
 
-void DreamGenContext::soundOnReels() {
-	STACK_CHECK;
-	bl = data.byte(kReallocation);
-	_add(bl, bl);
-	_xor(bh, bh);
-	_add(bx, 991);
-	si = cs.word(bx);
-reelsoundloop:
-	al = cs.byte(si);
-	_cmp(al, 255);
-	if (flags.z())
-		goto endreelsound;
-	ax = cs.word(si+1);
-	_cmp(ax, data.word(kReelpointer));
-	if (!flags.z())
-		goto skipreelsound;
-	_cmp(ax, data.word(kLastsoundreel));
-	if (flags.z())
-		goto skipreelsound;
-	data.word(kLastsoundreel) = ax;
-	al = cs.byte(si);
-	_cmp(al, 64);
-	if (flags.c())
-		{ playChannel1(); return; };
-	_cmp(al, 128);
-	if (flags.c())
-		goto channel0once;
-	_and(al, 63);
-	ah = 255;
-	{ playChannel0(); return; };
-channel0once:
-	_and(al, 63);
-	ah = 0;
-	{ playChannel0(); return; };
-skipreelsound:
-	_add(si, 3);
-	goto reelsoundloop;
-endreelsound:
-	ax = data.word(kLastsoundreel);
-	_cmp(ax, data.word(kReelpointer));
-	if (flags.z())
-		return /* (nochange2) */;
-	data.word(kLastsoundreel) = -1;
-}
-
 void DreamGenContext::delEverything() {
 	STACK_CHECK;
 	al = data.byte(kMapysize);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4d1244fe6a..af03e1936d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -895,7 +895,6 @@ public:
 	void selectOpenOb();
 	void security();
 	void showSlots();
-	void soundOnReels();
 	void useGun();
 	void autoAppear();
 	void openRyan();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 92b78ce896..f34f0c9616 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -869,5 +869,50 @@ void DreamGenContext::reconstruct() {
 	data.byte(kHavedoneobs) = 0;
 }
 
+void DreamGenContext::soundOnReels() {
+	STACK_CHECK;
+	bl = data.byte(kReallocation);
+	_add(bl, bl);
+	_xor(bh, bh);
+	_add(bx, 991);
+	si = cs.word(bx);
+reelsoundloop:
+	al = cs.byte(si);
+	_cmp(al, 255);
+	if (flags.z())
+		goto endreelsound;
+	ax = cs.word(si+1);
+	_cmp(ax, data.word(kReelpointer));
+	if (!flags.z())
+		goto skipreelsound;
+	_cmp(ax, data.word(kLastsoundreel));
+	if (flags.z())
+		goto skipreelsound;
+	data.word(kLastsoundreel) = ax;
+	al = cs.byte(si);
+	_cmp(al, 64);
+	if (flags.c())
+		{ playChannel1(); return; };
+	_cmp(al, 128);
+	if (flags.c())
+		goto channel0once;
+	_and(al, 63);
+	ah = 255;
+	{ playChannel0(); return; };
+channel0once:
+	_and(al, 63);
+	ah = 0;
+	{ playChannel0(); return; };
+skipreelsound:
+	_add(si, 3);
+	goto reelsoundloop;
+endreelsound:
+	ax = data.word(kLastsoundreel);
+	_cmp(ax, data.word(kReelpointer));
+	if (flags.z())
+		return /* (nochange2) */;
+	data.word(kLastsoundreel) = -1;
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index d600c4238e..70263fae94 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -429,4 +429,5 @@
 	void loadPersonal();
 	void loadNews();
 	void loadCart();
+	void soundOnReels();