[Scummvm-cvs-logs] scummvm master -> 1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd

[tramboi]

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:
1789ca436e DREAMWEB: 'getRidOfAll' ported to C++


Commit: 1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd
    https://github.com/scummvm/scummvm/commit/1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T08:37:22-08:00

Commit Message:
DREAMWEB: 'getRidOfAll' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index e62a32e..ab6390f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -257,6 +257,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getpersframe',
 	'getreelframeax',
 	'getreelstart',
+	'getridofall',
 	'getridofpit',
 	'getridoftemp',
 	'getridoftemp2',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index df37b9f..26142a2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10937,34 +10937,6 @@ void DreamGenContext::getRidOfReels() {
 	deallocateMem();
 }
 
-void DreamGenContext::getRidOfAll() {
-	STACK_CHECK;
-	es = data.word(kBackdrop);
-	deallocateMem();
-	es = data.word(kSetframes);
-	deallocateMem();
-	es = data.word(kReel1);
-	deallocateMem();
-	es = data.word(kReel2);
-	deallocateMem();
-	es = data.word(kReel3);
-	deallocateMem();
-	es = data.word(kReels);
-	deallocateMem();
-	es = data.word(kPeople);
-	deallocateMem();
-	es = data.word(kSetdesc);
-	deallocateMem();
-	es = data.word(kBlockdesc);
-	deallocateMem();
-	es = data.word(kRoomdesc);
-	deallocateMem();
-	es = data.word(kFreeframes);
-	deallocateMem();
-	es = data.word(kFreedesc);
-	deallocateMem();
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a157831..9dbb041 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -691,7 +691,6 @@ public:
 	void monks2text();
 	void clearPalette();
 	void cantDrop();
-	void getRidOfAll();
 	void copper();
 	void openHotelDoor();
 	void blank();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 25a40cb..a498c90 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2633,6 +2633,21 @@ void DreamGenContext::getRidOfTempsP() {
 	deallocateMem(data.word(kTempsprites));
 }
 
+void DreamGenContext::getRidOfAll() {
+	deallocateMem(data.word(kBackdrop));
+	deallocateMem(data.word(kSetframes));
+	deallocateMem(data.word(kReel1));
+	deallocateMem(data.word(kReel2));
+	deallocateMem(data.word(kReel3));
+	deallocateMem(data.word(kReels));
+	deallocateMem(data.word(kPeople));
+	deallocateMem(data.word(kSetdesc));
+	deallocateMem(data.word(kBlockdesc));
+	deallocateMem(data.word(kRoomdesc));
+	deallocateMem(data.word(kFreeframes));
+	deallocateMem(data.word(kFreedesc));
+}
+
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamGenContext::loadRoomData(const Room &room, bool skipDat) {
 	engine->openFile(room.name);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 99ef27b..926434e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -347,6 +347,7 @@
 	void useTempCharset();
 	void useCharset1();
 	void getBackFromOb();
+	void getRidOfAll();
 	void getRidOfTemp();
 	void getRidOfTempText();
 	void getRidOfTemp2();