aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-05-26 21:30:02 +0200
committerEugene Sandulenko2016-05-26 21:30:02 +0200
commit36526cb27baa79ce50d16158a904eae96453693e (patch)
treec6a5231b68ed59e71bcf8b7fe5b3a12aeecdb80e /engines/scumm/scumm.cpp
parentedb8e6865b972e441cb73ad972df66ee69d1b45a (diff)
downloadscummvm-rg350-36526cb27baa79ce50d16158a904eae96453693e.tar.gz
scummvm-rg350-36526cb27baa79ce50d16158a904eae96453693e.tar.bz2
scummvm-rg350-36526cb27baa79ce50d16158a904eae96453693e.zip
SCUMM HE: Moved Moonbase to ScummEngine_v100he
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 4adf0c5066..d5727f2a7c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -885,7 +885,20 @@ ScummEngine_v90he::ScummEngine_v90he(OSystem *syst, const DetectorResult &dr)
VAR_U32_VERSION = 0xFF;
VAR_U32_ARRAY_UNK = 0xFF;
+}
+ScummEngine_v90he::~ScummEngine_v90he() {
+ delete _moviePlay;
+ delete _sprite;
+ if (_game.heversion >= 98) {
+ delete _logicHE;
+ }
+ if (_game.heversion >= 99) {
+ free(_hePalettes);
+ }
+}
+
+ScummEngine_v100he::ScummEngine_v100he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v99he(syst, dr) {
/* Moonbase stuff */
_moonbase = 0;
@@ -900,15 +913,7 @@ ScummEngine_v90he::ScummEngine_v90he(OSystem *syst, const DetectorResult &dr)
VAR_U32_USER_VAR_F = 0xFF;
}
-ScummEngine_v90he::~ScummEngine_v90he() {
- delete _moviePlay;
- delete _sprite;
- if (_game.heversion >= 98) {
- delete _logicHE;
- }
- if (_game.heversion >= 99) {
- free(_hePalettes);
- }
+ScummEngine_v100he::~ScummEngine_v100he() {
delete _moonbase;
}