diff options
author | Bertrand Augereau | 2011-11-16 12:54:26 +0100 |
---|---|---|
committer | Bertrand Augereau | 2011-11-16 12:54:26 +0100 |
commit | 63a9416bd11f9d7cee8166d1da7aa1994e35f4a3 (patch) | |
tree | 07bafe8dd9d1bbc882c236f7be87f89f963dd4c6 | |
parent | ec14d38cf15c1a2fa100a198d36b3b41444b01bc (diff) | |
download | scummvm-rg350-63a9416bd11f9d7cee8166d1da7aa1994e35f4a3.tar.gz scummvm-rg350-63a9416bd11f9d7cee8166d1da7aa1994e35f4a3.tar.bz2 scummvm-rg350-63a9416bd11f9d7cee8166d1da7aa1994e35f4a3.zip |
DREAMWEB: Removed the check that there is enough memory
-rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 11 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 1 |
4 files changed, 2 insertions, 14 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 7c317cf30e..f15d3d93f3 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 2c87e7db06..73ed6f121d 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 18a840b812..20ef2f9818 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 c7ac04965f..a01949edfb 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -41,7 +41,6 @@ void DreamGenContext::dreamweb() { } seecommandtail(); - checkbasemem(); soundstartup(); setkeyboardint(); setupemm(); |