From 36526cb27baa79ce50d16158a904eae96453693e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 26 May 2016 21:30:02 +0200 Subject: SCUMM HE: Moved Moonbase to ScummEngine_v100he --- engines/scumm/scumm.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'engines/scumm/scumm.cpp') 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; } -- cgit v1.2.3