5 files changed, 18 insertions, 48 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 477f409ca5..b5094dfb1a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -7418,33 +7418,6 @@ void DreamGenContext::clearChanges() {
 	_stosw(cx, true);
 }
 
-void DreamGenContext::clearRest() {
-	STACK_CHECK;
-	es = data.word(kMapdata);
-	cx = (66*60)/2;
-	ax = 0;
-	di = (0);
-	_stosw(cx, true);
-	es = data.word(kBackdrop);
-	deallocateMem();
-	es = data.word(kSetframes);
-	deallocateMem();
-	es = data.word(kReels);
-	deallocateMem();
-	es = data.word(kPeople);
-	deallocateMem();
-	es = data.word(kSetdesc);
-	deallocateMem();
-	es = data.word(kBlockdesc);
-	deallocateMem();
-	es = data.word(kRoomdesc);
-	deallocateMem();
-	es = data.word(kFreeframes);
-	deallocateMem();
-	es = data.word(kFreedesc);
-	deallocateMem();
-}
-
 void DreamGenContext::watchReel() {
 	STACK_CHECK;
 	_cmp(data.word(kReeltowatch), -1);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7b7b3add32..572564c6cb 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -556,7 +556,6 @@ public:
 	void checkInput();
 	void putUnderCentre();
 	void checkObjectSize();
-	void deallocateMem();
 	void showGroup();
 	void watchReel();
 	void openFileFromC();
@@ -575,7 +574,6 @@ public:
 	void keyboardRead();
 	void getOpenedSize();
 	void resetKeyboard();
-	void soundStartup();
 	void adjustUp();
 	void fadeScreenDownHalf();
 	void mouseCall();
@@ -598,7 +596,6 @@ public:
 	void runTap();
 	void talk();
 	void dumpDiaryKeys();
-	void disableSoundInt();
 	void checkForExit();
 	void lookInInterface();
 	void inToInv();
@@ -639,8 +636,8 @@ public:
 	void useCooker();
 	void receptionist();
 	void selectSlot();
+	void openFileNoCheck();
 	void fadeUpMon();
-	void soundEnd();
 	void clearChanges();
 	void introMagic2();
 	void introMagic3();
@@ -656,7 +653,6 @@ public:
 	void diaryKeyN();
 	void set16ColPalette();
 	void purgeAnItem();
-	void enableSoundInt();
 	void purgeALocation();
 	void notHeldError();
 	void getSetAd();
@@ -674,15 +670,13 @@ public:
 	void bossMan();
 	void searchForSame();
 	void fadeFromWhite();
-	void checkSoundInt();
 	void rollEm();
 	void poolGuard();
 	void lookAtPlace();
 	void useAxe();
 	void findAllOpen();
-	void quitSymbol();
 	void readFromFile();
-	void interruptTest();
+	void quitSymbol();
 	void findSetObject();
 	void useDiary();
 	void deleteExObject();
@@ -714,7 +708,6 @@ public:
 	void swapWithOpen();
 	void dreamweb();
 	void dropError();
-	void openFileNoCheck();
 	void checkInside();
 	void findPathOfPoint();
 	void getBack1();
@@ -735,7 +728,6 @@ public:
 	void findExObject();
 	void searchForFiles();
 	void monkSpeaking();
-	void clearRest();
 	void madmanRun();
 	void afterNewRoom();
 	void getExAd();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index a7e6379eb3..14794a81a8 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1165,7 +1165,20 @@ void DreamGenContext::clearBeforeLoad() {
 		return /* (noclear) */;
 
 	clearReels();
-	clearRest();
+
+	//clearRest
+	uint8 *dst = (uint8 *)getSegment(data.word(kMapdata)).ptr(0, 0);
+	memset(dst, 0, kMaplen);
+	deallocateMem(data.word(kBackdrop));
+	deallocateMem(data.word(kSetframes));
+	deallocateMem(data.word(kReels));
+	deallocateMem(data.word(kPeople));
+	deallocateMem(data.word(kSetdesc));
+	deallocateMem(data.word(kBlockdesc));
+	deallocateMem(data.word(kRoomdesc));
+	deallocateMem(data.word(kFreeframes));
+	deallocateMem(data.word(kFreedesc));
+
 	data.byte(kRoomloaded) = 0;
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d0e8eb1450..6d13ed6378 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -472,7 +472,7 @@ void DreamGenContext::dreamweb() {
 	}
 
 	seeCommandTail();
-	soundStartup();
+	// soundStartup used to be done here...
 	setKeyboardInt();
 	allocateBuffers();
 	setMouse();
@@ -1058,15 +1058,6 @@ void DreamGenContext::deallocateMem(uint16 segment) {
 	}
 }
 
-void DreamGenContext::soundStartup() {}
-void DreamGenContext::soundEnd() {}
-void DreamGenContext::interruptTest() {}
-void DreamGenContext::disableSoundInt() {}
-void DreamGenContext::enableSoundInt() {}
-void DreamGenContext::checkSoundInt() {
-	data.byte(kTestresult) = 1;
-}
-
 void DreamGenContext::loadSpeech() {
 	cancelCh1();
 	data.byte(kSpeechloaded) = 0;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index d03961d4a1..1b80818b5e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -29,6 +29,7 @@
 	void switchRyanOn();
 	void switchRyanOff();
 	uint16 allocateMem(uint16 paragraphs);
+	void deallocateMem();
 	void deallocateMem(uint16 segment);
 	uint8 *textUnder();
 	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry