diff options
author | Bertrand Augereau | 2011-12-04 17:37:22 +0100 |
---|---|---|
committer | Bertrand Augereau | 2011-12-04 17:37:22 +0100 |
commit | 1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd (patch) | |
tree | b7776a3598aeb42d8ed2fc3022feded7d991c266 /engines | |
parent | 4d4a63bb91c042b26bda680fe2fff22aa334acc0 (diff) | |
download | scummvm-rg350-1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd.tar.gz scummvm-rg350-1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd.tar.bz2 scummvm-rg350-1789ca436e8ae4cfdd4e6e7baee3c8e84928f5bd.zip |
DREAMWEB: 'getRidOfAll' ported to C++
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 28 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 15 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 1 |
4 files changed, 16 insertions, 29 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index df37b9f909..26142a2590 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 a157831ed9..9dbb041998 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 25a40cbc2a..a498c905d2 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 99ef27b23e..926434ec3b 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(); |