[Scummvm-cvs-logs] scummvm master -> bdded1ce12212e092452a7b4943e99cad4c16a14

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bdded1ce12 DREAMWEB: The ASM-style version of getEitherAd() is no longer needed


Commit: bdded1ce12212e092452a7b4943e99cad4c16a14
    https://github.com/scummvm/scummvm/commit/bdded1ce12212e092452a7b4943e99cad4c16a14
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-25T12:11:27-08:00

Commit Message:
DREAMWEB: The ASM-style version of getEitherAd() is no longer needed

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 120e5ad..032a404 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -477,6 +477,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getblockofpixel',
 	'getdestinfo',
 	'getdimension',
+	'geteitherad',
 	'getexpos',
 	'getflagunderp',
 	'getkeyandlogo',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f71ced9..0dffe56 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -303,19 +303,6 @@ void DreamGenContext::getExAd() {
 	_add(bx, (0+2080+30000));
 }
 
-void DreamGenContext::getEitherAd() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto isinexlist;
-	al = data.byte(kItemframe);
-	getFreeAd();
-	return;
-isinexlist:
-	al = data.byte(kItemframe);
-	getExAd();
-}
-
 void DreamGenContext::getAnyAd() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7247bed..0f6bfc0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -465,7 +465,6 @@ public:
 	void rollEm();
 	void findAllOpen();
 	void fillOpen();
-	void getEitherAd();
 	void dreamweb();
 	void findPathOfPoint();
 	void read();