[Scummvm-cvs-logs] scummvm master -> 63a9416bd11f9d7cee8166d1da7aa1994e35f4a3

tramboi bertrand_augereau at yahoo.fr
Wed Nov 16 10:56:24 CET 2011


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:
63a9416bd1 DREAMWEB: Removed the check that there is enough memory


Commit: 63a9416bd11f9d7cee8166d1da7aa1994e35f4a3
    https://github.com/scummvm/scummvm/commit/63a9416bd11f9d7cee8166d1da7aa1994e35f4a3
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-16T03:54:26-08:00

Commit Message:
DREAMWEB: Removed the check that there is enough memory

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 7c317cf..f15d3d9 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -211,6 +211,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'transfertext',
 	'splitintolines',
 	'initrain',
+	'checkbasemem',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2c87e7d..73ed6f1 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -13293,16 +13293,6 @@ void DreamGenContext::checkforemm() {
 	STACK_CHECK;
 }
 
-void DreamGenContext::checkbasemem() {
-	STACK_CHECK;
-	bx = data.word(kHowmuchalloc);
-	_cmp(bx, 0x9360);
-	if (!flags.c())
-		return /* (enoughmem) */;
-	data.byte(kGameerror) = 5;
-	{ quickquit(); return; };
-}
-
 void DreamGenContext::allocatebuffers() {
 	STACK_CHECK;
 	bx = (0+2080+30000+(16*114)+((114+2)*2)+18000)/16;
@@ -16632,7 +16622,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_setupemm: setupemm(); break;
 		case addr_removeemm: removeemm(); break;
 		case addr_checkforemm: checkforemm(); break;
-		case addr_checkbasemem: checkbasemem(); break;
 		case addr_allocatebuffers: allocatebuffers(); break;
 		case addr_clearbuffers: clearbuffers(); break;
 		case addr_clearchanges: clearchanges(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 18a840b..20ef2f9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -128,7 +128,6 @@ public:
 	static const uint16 addr_clearchanges = 0xc974;
 	static const uint16 addr_clearbuffers = 0xc970;
 	static const uint16 addr_allocatebuffers = 0xc96c;
-	static const uint16 addr_checkbasemem = 0xc968;
 	static const uint16 addr_checkforemm = 0xc964;
 	static const uint16 addr_removeemm = 0xc960;
 	static const uint16 addr_setupemm = 0xc95c;
@@ -1596,7 +1595,7 @@ public:
 	void mainman();
 	void mansatstill();
 	void channel1only();
-	void checkbasemem();
+	//void checkbasemem();
 	void lastfolder();
 	void transfermap();
 	void showmonk();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c7ac049..a01949e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -41,7 +41,6 @@ void DreamGenContext::dreamweb() {
 	}
 
 	seecommandtail();
-	checkbasemem();
 	soundstartup();
 	setkeyboardint();
 	setupemm();






More information about the Scummvm-git-logs mailing list