DREAMWEB: 'getridoftempXXX' family ported to C++

5 files changed, 40 insertions, 46 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 3d545633f8..bcec59d2f6 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -167,6 +167,12 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getreelframeax',
 	'getreelstart',
 	'getridofpit',
+	'getridoftemp',
+	'getridoftemp2',
+	'getridoftemp3',
+	'getridoftempcharset',
+	'getridoftempsp',
+	'getridoftemptext',
 	'getroomdata',
 	'getroomspaths',
 	'getundermenu',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b89c1dcc27..012f31676d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -11492,42 +11492,6 @@ void DreamGenContext::getRidOfAll() {
 	deallocateMem();
 }
 
-void DreamGenContext::getRidOfTemp() {
-	STACK_CHECK;
-	es = data.word(kTempgraphics);
-	deallocateMem();
-}
-
-void DreamGenContext::getRidOfTempText() {
-	STACK_CHECK;
-	es = data.word(kTextfile1);
-	deallocateMem();
-}
-
-void DreamGenContext::getRidOfTemp2() {
-	STACK_CHECK;
-	es = data.word(kTempgraphics2);
-	deallocateMem();
-}
-
-void DreamGenContext::getRidOfTemp3() {
-	STACK_CHECK;
-	es = data.word(kTempgraphics3);
-	deallocateMem();
-}
-
-void DreamGenContext::getRidOfTempCharset() {
-	STACK_CHECK;
-	es = data.word(kTempcharset);
-	deallocateMem();
-}
-
-void DreamGenContext::getRidOfTempsP() {
-	STACK_CHECK;
-	es = data.word(kTempsprites);
-	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 6acfb8ef4b..0ddfd859ed 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -690,7 +690,6 @@ public:
 	void introMonks2();
 	void advisor();
 	void additionalText();
-	void doFade();
 	void useElevator5();
 	void useElevator4();
 	void useElevator1();
@@ -735,12 +734,11 @@ public:
 	void getUnderZoom();
 	void candles();
 	void backObject();
-	void allocateMem();
+	void rollEndCredits2();
 	void reminders();
 	void selectSlot2();
 	void runTap();
 	void talk();
-	void getRidOfTemp2();
 	void useBalcony();
 	void decide();
 	void disableSoundInt();
@@ -766,7 +764,6 @@ public:
 	void useCoveredBox();
 	void openYourNeighbour();
 	void fadeScreenUpHalf();
-	void getRidOfTempCharset();
 	void heavy();
 	void useKey();
 	void lockLightOn();
@@ -801,7 +798,6 @@ public:
 	void workoutFrames();
 	void dumpSymBox();
 	void loadGame();
-	void getRidOfTemp();
 	void dumpSymbol();
 	void intro2Text();
 	void interviewer();
@@ -831,7 +827,6 @@ public:
 	void transferToEx();
 	void reExFromInv();
 	void examineInventory();
-	void getRidOfTemp3();
 	void useDryer();
 	void outOfInv();
 	void diaryKeyP();
@@ -916,13 +911,13 @@ public:
 	void showOpBox();
 	void clearBeforeLoad();
 	void bibleQuote();
-	void showExit();
+	void doFade();
 	void useTrainer();
 	void dumpCurrent();
 	void showDiaryKeys();
 	void dontLoadSeg();
 	void intro3Text();
-	void rollEndCredits2();
+	void allocateMem();
 	void useOpened();
 	void inventory();
 	void fillOpen();
@@ -950,7 +945,6 @@ public:
 	void isSetObOnMap();
 	void getDestInfo();
 	void drunk();
-	void getRidOfTempText();
 	void setupTimedUse();
 	void grafittiDoor();
 	void nextDest();
@@ -985,6 +979,7 @@ public:
 	void showPuzText();
 	void incRyanPage();
 	void useElevator3();
+	void showExit();
 	void findExObject();
 	void clearChanges();
 	void useChurchHole();
@@ -1035,7 +1030,6 @@ public:
 	void intro();
 	void fadeScreenDowns();
 	void openHotelDoor2();
-	void getRidOfTempsP();
 	void selectLocation();
 	void underTextLine();
 	void sitDownInBar();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 846937b3fa..af2f608571 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2417,6 +2417,30 @@ void DreamGenContext::useTempCharset() {
 	data.word(kCurrentset) = data.word(kTempcharset);
 }
 
+void DreamGenContext::getRidOfTemp() {
+	deallocateMem(data.word(kTempgraphics));
+}
+
+void DreamGenContext::getRidOfTempText() {
+	deallocateMem(data.word(kTextfile1));
+}
+
+void DreamGenContext::getRidOfTemp2() {
+	deallocateMem(data.word(kTempgraphics2));
+}
+
+void DreamGenContext::getRidOfTemp3() {
+	deallocateMem(data.word(kTempgraphics3));
+}
+
+void DreamGenContext::getRidOfTempCharset() {
+	deallocateMem(data.word(kTempcharset));
+}
+
+void DreamGenContext::getRidOfTempsP() {
+	deallocateMem(data.word(kTempsprites));
+}
+
 // 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 6b3881b8ac..348855c7ac 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -344,6 +344,12 @@
 	void useTempCharset();
 	void useCharset1();
 	void getBackFromOb();
+	void getRidOfTemp();
+	void getRidOfTempText();
+	void getRidOfTemp2();
+	void getRidOfTemp3();
+	void getRidOfTempCharset();
+	void getRidOfTempsP();
 	void showFirstUse();
 	void showSecondUse();
 	void actualSave();