DREAMWEB: Remove unreferenced stubs and unused sound blaster stuff

4 files changed, 24 insertions, 123 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a87d52992b..a2e6435bd0 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -319,6 +319,20 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'random',
 	'drawfloor',
 	'allocatebuffers',
+	'startdmablock',
+	'dmaend',
+	'bothchannels',
+	'channel1only',
+	'channel0only',
+	'restoreems',
+	'saveems',
+	'out22c',
+	'pitinterupt',
+	'getridofpit'
+	'setuppit',
+	'removeemm',
+	'setupemm',
+	'trysoundalloc',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 04cf5559a7..d5d2ca8e4e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10934,39 +10934,6 @@ tensc:
 	cs.byte(di+7) = al;
 }
 
-void DreamGenContext::trysoundalloc() {
-	STACK_CHECK;
-	_cmp(data.byte(kNeedsoundbuff), 1);
-	if (flags.z())
-		return /* (gotsoundbuff) */;
-	_inc(data.byte(kSoundtimes));
-	bx = (16384+2048)/16;
-	allocatemem();
-	data.word(kSoundbuffer) = ax;
-	push(ax);
-	al = ah;
-	cl = 4;
-	_shr(al, cl);
-	data.byte(kSoundbufferpage) = al;
-	ax = pop();
-	cl = 4;
-	_shl(ax, cl);
-	data.word(kSoundbufferad) = ax;
-	_cmp(ax, 0x0b7ff);
-	if (!flags.c())
-		goto soundfail;
-	es = data.word(kSoundbuffer);
-	di = 0;
-	cx = 16384/2;
-	ax = 0x7f7f;
-	_stosw(cx, true);
-	data.byte(kNeedsoundbuff) = 1;
-	return;
-soundfail:
-	es = data.word(kSoundbuffer);
-	deallocatemem();
-}
-
 void DreamGenContext::volumeadjust() {
 	STACK_CHECK;
 	al = data.byte(kVolumedirection);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3cd2f737e0..834abf04f0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -95,31 +95,19 @@ public:
 	static const uint16 addr_clearchanges = 0xc974;
 	static const uint16 addr_clearbuffers = 0xc970;
 	static const uint16 addr_checkforemm = 0xc964;
-	static const uint16 addr_removeemm = 0xc960;
-	static const uint16 addr_setupemm = 0xc95c;
 	static const uint16 addr_pickupob = 0xc958;
 	static const uint16 addr_initialinv = 0xc954;
 	static const uint16 addr_entryanims = 0xc950;
 	static const uint16 addr_entrytexts = 0xc94c;
-	static const uint16 addr_pitinterupt = 0xc944;
 	static const uint16 addr_getridofpit = 0xc940;
 	static const uint16 addr_setuppit = 0xc93c;
-	static const uint16 addr_startdmablock = 0xc938;
-	static const uint16 addr_dmaend = 0xc934;
-	static const uint16 addr_restoreems = 0xc92c;
-	static const uint16 addr_saveems = 0xc928;
-	static const uint16 addr_bothchannels = 0xc924;
-	static const uint16 addr_channel1only = 0xc91c;
-	static const uint16 addr_channel0only = 0xc918;
 	static const uint16 addr_volumeadjust = 0xc908;
-	static const uint16 addr_out22c = 0xc8f8;
 	static const uint16 addr_soundend = 0xc8f4;
 	static const uint16 addr_interupttest = 0xc8f0;
 	static const uint16 addr_disablesoundint = 0xc8ec;
 	static const uint16 addr_enablesoundint = 0xc8e8;
 	static const uint16 addr_checksoundint = 0xc8e4;
 	static const uint16 addr_setsoundoff = 0xc8e0;
-	static const uint16 addr_trysoundalloc = 0xc8dc;
 	static const uint16 addr_soundstartup = 0xc8d8;
 	static const uint16 addr_loadsecondsample = 0xc8d4;
 	static const uint16 addr_loadsample = 0xc8d0;
@@ -1116,21 +1104,17 @@ public:
 	static const uint16 kMenux = (80+40);
 	static const uint16 kLenofreelrouts = (991-534);
 
-	void bothchannels();
 	void usewire();
 	void getnamepos();
 	void femalefan();
 	void identifyob();
-	void trysoundalloc();
 	void uselighter();
 	void showmenu();
 	void usepoolreader();
-	void startdmablock();
 	void useopenbox();
 	void clearbuffers();
-	void channel0only();
+	void showsymbol();
 	void worktoscreenm();
-	void removeemm();
 	void getobtextstart();
 	void dumpdiarykeys();
 	void getridofreels();
@@ -1202,13 +1186,12 @@ public:
 	void outofopen();
 	void dircom();
 	void dumpkeypad();
-	void showsymbol();
+	void dumpzoom();
 	void endgameseq();
 	void setbotleft();
 	void findfirstpath();
 	void loadold();
 	void useslab();
-	void dumpzoom();
 	void usealtar();
 	void manasleep2();
 	void moretalk();
@@ -1331,9 +1314,8 @@ public:
 	void usedryer();
 	void outofinv();
 	void diarykeyp();
-	void mainman();
+	void reexfromopen();
 	void mansatstill();
-	void channel1only();
 	void transfermap();
 	void showmonk();
 	void diarykeyn();
@@ -1374,7 +1356,6 @@ public:
 	void fadefromwhite();
 	void usewindow();
 	void wearshades();
-	void pitinterupt();
 	void deleverything();
 	void fadescreendown();
 	void poolguard();
@@ -1404,7 +1385,6 @@ public:
 	void deleteexobject();
 	void moneypoke();
 	void destselect();
-	void restoreems();
 	void lastdest();
 	void removefreeobject();
 	void trapdoor();
@@ -1416,7 +1396,7 @@ public:
 	void setpickup();
 	void dropobject();
 	void isitright();
-	void reexfromopen();
+	void openob();
 	void drawitall();
 	void usestereo();
 	void candles2();
@@ -1429,7 +1409,6 @@ public:
 	void showexit();
 	void usetrainer();
 	void addtopresslist();
-	void dmaend();
 	void dumpcurrent();
 	void showdiarykeys();
 	void dontloadseg();
@@ -1445,7 +1424,6 @@ public:
 	void examicon();
 	void showgun();
 	void louischair();
-	void saveems();
 	void locationpic();
 	void opentvdoor();
 	void triggermessage();
@@ -1473,7 +1451,6 @@ public:
 	void hotelcontrol();
 	void mugger();
 	void atmospheres();
-	void out22c();
 	void loadpersonal();
 	void gettingshot();
 	void settopleft();
@@ -1536,7 +1513,7 @@ public:
 	void makemainscreen();
 	void usewinch();
 	void setbotright();
-	void setupemm();
+	void mainman();
 	void aide();
 	void geteitherad();
 	void zoomonoff();
@@ -1577,7 +1554,6 @@ public:
 	void panelicons1();
 	void adjustdown();
 	void withwhat();
-	void openob();
 	void createfile();
 	void userailing();
 	void usehole();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ab574c5fab..09f6f7109e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -43,7 +43,6 @@ void DreamGenContext::dreamweb() {
 	seecommandtail();
 	soundstartup();
 	setkeyboardint();
-	setupemm();
 	allocatebuffers();
 	setmouse();
 	fadedos();
@@ -642,57 +641,6 @@ void DreamGenContext::deallocatemem(uint16 segment) {
 	}
 }
 
-void DreamGenContext::removeemm() {
-	::error("removeemm");
-}
-
-void DreamGenContext::setupemm() {
-}
-
-void DreamGenContext::pitinterupt() {
-	::error("pitinterupt");
-}
-
-void DreamGenContext::getridofpit() {
-	::error("getridofpit");
-}
-
-void DreamGenContext::setuppit() {
-	::error("setuppit");
-}
-
-void DreamGenContext::startdmablock() {
-	::error("startdmablock");
-}
-
-void DreamGenContext::dmaend() {
-	::error("dmaend");
-}
-
-void DreamGenContext::restoreems() {
-	::error("restoreems");
-}
-
-void DreamGenContext::saveems() {
-	::error("saveems");
-}
-
-void DreamGenContext::bothchannels() {
-	::error("bothchannels");
-}
-
-void DreamGenContext::channel1only() {
-	::error("channel1only");
-}
-
-void DreamGenContext::channel0only() {
-	::error("channel0only");
-}
-
-void DreamGenContext::out22c() {
-	::error("out22c");
-}
-
 void DreamGenContext::soundstartup() {}
 void DreamGenContext::soundend() {}
 void DreamGenContext::interupttest() {}
@@ -2097,10 +2045,11 @@ void DreamGenContext::readsetdata() {
 	data.word(kCurrentset) = ax;
 	if (data.byte(kSoundint) == 0xff)
 		return;
-	engine->openFile("DREAMWEB.VOL");
-	uint8 *volumeTab = segRef(data.word(kSoundbuffer)).ptr(16384, 0);
-	engine->readFromFile(volumeTab, 2048-256);
-	engine->closeFile();
+
+	//engine->openFile("DREAMWEB.VOL");
+	//uint8 *volumeTab = segRef(data.word(kSoundbuffer)).ptr(16384, 0);
+	//engine->readFromFile(volumeTab, 2048-256);
+	//engine->closeFile();
 }
 
 Frame * DreamGenContext::tempGraphics() {
@@ -2524,15 +2473,10 @@ void DreamGenContext::drawfloor() {
 
 void DreamGenContext::allocatebuffers() {
 	data.word(kExtras) = allocatemem(kLengthofextra/16);
-	trysoundalloc();
 	data.word(kMapdata) = allocatemem(kLengthofmap/16);
-	trysoundalloc();
 	data.word(kBuffers) = allocatemem(kLengthofbuffer/16);
-	trysoundalloc();
 	data.word(kFreedat) = allocatemem(kFreedatlen/16);
-	trysoundalloc();
 	data.word(kSetdat) = allocatemem(kSetdatlen/16);
-	trysoundalloc();
 	data.word(kMapstore) = allocatemem(kLenofmapstore/16);
 	allocatework();
 	data.word(kSounddata) = allocatemem(2048/16);