DREAMWEB: Remove the now unused ASM style versions of getanyad, getexad, getfreead and getsetad

5 files changed, 8 insertions, 59 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 9fd0a2c10f..e531834dec 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -500,6 +500,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'gamer',
 	'gates',
 	'generalerror',
+	'getanyad',
 	'getanyaddir',
 	'getback1',
 	'getbackfromob',
@@ -509,8 +510,10 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getdestinfo',
 	'getdimension',
 	'geteitherad',
+	'getexad',
 	'getexpos',
 	'getflagunderp',
+	'getfreead',
 	'getkeyandlogo',
 	'getlocation',
 	'getmapad',
@@ -534,6 +537,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getridoftemptext',
 	'getroomdata',
 	'getroomspaths',
+	'getsetad',
 	'gettime',
 	'gettingshot',
 	'getundercentre',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 282fab2db2..77af051122 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,57 +73,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::getFreeAd() {
-	STACK_CHECK;
-	ah = 0;
-	cl = 4;
-	_shl(ax, cl);
-	bx = ax;
-	es = data.word(kFreedat);
-}
-
-void DreamGenContext::getExAd() {
-	STACK_CHECK;
-	ah = 0;
-	bx = 16;
-	_mul(bx);
-	bx = ax;
-	es = data.word(kExtras);
-	_add(bx, (0+2080+30000));
-}
-
-void DreamGenContext::getAnyAd() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto isex;
-	_cmp(data.byte(kObjecttype), 2);
-	if (flags.z())
-		goto isfree;
-	al = data.byte(kCommand);
-	getSetAd();
-	ax = es.word(bx+4);
-	return;
-isfree:
-	al = data.byte(kCommand);
-	getFreeAd();
-	ax = es.word(bx+7);
-	return;
-isex:
-	al = data.byte(kCommand);
-	getExAd();
-	ax = es.word(bx+7);
-}
-
-void DreamGenContext::getSetAd() {
-	STACK_CHECK;
-	ah = 0;
-	bx = 64;
-	_mul(bx);
-	bx = ax;
-	es = data.word(kSetdat);
-}
-
 void DreamGenContext::pickupConts() {
 	STACK_CHECK;
 	al = ds.byte(si+7);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d377489da4..d3bb80da1a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -428,16 +428,12 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void dirCom();
-	void getAnyAd();
-	void getFreeAd();
 	void dirFile();
 	void pickupConts();
 	void transferMap();
-	void getSetAd();
 	void dreamweb();
 	void read();
 	void searchForString();
-	void getExAd();
 	void parser();
 	void transferConToEx();
 };
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8535b17e2f..7c4bfe8a92 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2725,7 +2725,8 @@ void DreamGenContext::pickupOb(uint8 command, uint8 pos) {
 	data.byte(kObjecttype) = kFreeObjectType;
 	data.byte(kItemframe) = command;
 	data.byte(kCommand) = command;
-	getAnyAd();
+	//uint8 dummy;
+	//getAnyAd(&dummy, &dummy);	// was in the original source, seems useless here
 	transferToEx();
 }
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 24ea58e252..25ed8d50e5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -127,9 +127,8 @@ void DreamGenContext::useRoutine() {
 		data.byte(kPointerpower) = 0;
 	}
 
-	getAnyAd();
-	// CHECKME: Do the callbacks use es:bx ?
-	void *obj = es.ptr(bx, 15);
+	uint8 dummy;
+	void *obj = getAnyAd(&dummy, &dummy);
 
 	for (size_t i = 0; i < sizeof(kUseList)/sizeof(UseListEntry); ++i) {
 		const UseListEntry &entry = kUseList[i];