DREAMWEB: 'introMusic' ported to C++

5 files changed, 10 insertions, 10 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f253f232fb..4fa01505c6 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -310,6 +310,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'input',
 	'intro',
 	'intromagic1',
+	'intromusic',
 	'inventory',
 	'isitdescribed',
 	'isitright',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 995cd8f001..c099e82b85 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -44,10 +44,6 @@ nobark:
 	es.word(bx+3) = ax;
 }
 
-void DreamGenContext::introMusic() {
-	STACK_CHECK;
-}
-
 void DreamGenContext::foghornSound() {
 	STACK_CHECK;
 	randomNumber();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4bd1e85fb3..f30c8e6d3a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -690,7 +690,6 @@ public:
 	void errorMessage3();
 	void introMagic2();
 	void introMagic3();
-	void edenInBath();
 	void showDiaryPage();
 	void useShield();
 	void getBackToOps();
@@ -699,7 +698,7 @@ public:
 	void transferToEx();
 	void reExFromInv();
 	void examineInventory();
-	void useDryer();
+	void businessMan();
 	void outOfInv();
 	void diaryKeyP();
 	void transferMap();
@@ -826,6 +825,7 @@ public:
 	void openFile();
 	void showPuzText();
 	void incRyanPage();
+	void edenInBath();
 	void findExObject();
 	void clearChanges();
 	void useChurchHole();
@@ -875,12 +875,11 @@ public:
 	void emergencyPurge();
 	void alleyBarkSound();
 	void useCart();
-	void introMusic();
 	void quitKey();
 	void processTrigger();
 	void volumeAdjust();
 	void transferConToEx();
-	void businessMan();
+	void useDryer();
 	void adjustDown();
 	void withWhat();
 	void openOb();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 508228a786..b1f509d3c8 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -43,7 +43,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, &DreamGenContext::businessMan,
 	&DreamGenContext::train, NULL,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
-	NULL, &DreamGenContext::introMusic,
+	NULL, NULL,
 	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
 	&DreamGenContext::gates, &DreamGenContext::introMagic3,
 	&DreamGenContext::introMonks1, &DreamGenContext::candles,
@@ -75,7 +75,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
 	/*&DreamGenContext::train*/NULL, &DreamGenContext::genericPerson /*aide*/,
 	/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
-	&DreamGenContext::introMagic1, /*&DreamGenContext::introMusic*/NULL,
+	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
 	/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
 	/*&DreamGenContext::gates*/NULL, /*&DreamGenContext::introMagic3*/NULL,
 	/*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL,
@@ -375,6 +375,9 @@ void DreamGenContext::introMagic1(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
+void DreamGenContext::introMusic(ReelRoutine &routine) {
+}
+
 void DreamGenContext::security(ReelRoutine &routine) {
 	if (routine.reelPointer() == 32) {
 		if (data.byte(kLastweapon) == 1) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 29a6460d3d..ac2fd401a2 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -411,6 +411,7 @@
 	void manAsleep(ReelRoutine &routine);
 	void drunk(ReelRoutine &routine);
 	void introMagic1(ReelRoutine &routine);
+	void introMusic(ReelRoutine &routine);
 	void security(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();