[Scummvm-cvs-logs] scummvm master -> e27b2aa39dc9f05fdf36fb829f2c8649836e2080
digitall
digitall at scummvm.org
Wed Dec 7 20:16:42 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:
e27b2aa39d DREAMWEB: Blacklist 'allocatemem' and remove parameter-less C++ version.
Commit: e27b2aa39dc9f05fdf36fb829f2c8649836e2080
https://github.com/scummvm/scummvm/commit/e27b2aa39dc9f05fdf36fb829f2c8649836e2080
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-07T11:15:25-08:00
Commit Message:
DREAMWEB: Blacklist 'allocatemem' and remove parameter-less C++ version.
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 1c5c957..c5afae9 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -153,6 +153,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'aide',
'allocatebuffers',
'allocateload',
+ 'allocatemem',
'allocatework',
'allpointer',
'animpointer',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f543846..3b56a44 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -591,7 +591,6 @@ public:
void endGame();
void usePipe();
void getUnderZoom();
- void rollEndCredits2();
void reminders();
void runTap();
void talk();
@@ -691,7 +690,7 @@ public:
void dumpCurrent();
void showDiaryKeys();
void dontLoadSeg();
- void allocateMem();
+ void rollEndCredits2();
void useOpened();
void fillOpen();
void signOn();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index add7438..09e9ac2 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1019,10 +1019,6 @@ void DreamGenContext::getTime() {
data.byte(kHourcount) = ch;
}
-void DreamGenContext::allocateMem() {
- ax = allocateMem(bx);
-}
-
uint16 DreamGenContext::allocateMem(uint16 paragraphs) {
uint size = (paragraphs + 2) * 16;
debug(1, "allocate mem, %u bytes", size);
More information about the Scummvm-git-logs
mailing list