diff options
| author | Travis Howell | 2007-12-27 11:40:29 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-12-27 11:40:29 +0000 |
| commit | 410a4a974ef78324ba6d8bd5535b2b46b231b0f7 (patch) | |
| tree | 0d51afe35658e4b7d880d8a495a2760b958b43ff /engines/scumm/scumm.cpp | |
| parent | 1bafd03a698130c21c222edb0bc011fc39a6e003 (diff) | |
| download | scummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.tar.gz scummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.tar.bz2 scummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.zip | |
Enable Windows version of early HE games by default, to match already enabled 3DO/DOS/Macintosh versions of early HE games. Adding only the minimum code required for HE70 games.
svn-id: r30011
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 78bd9321e6..18b170dacb 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -727,7 +727,6 @@ ScummEngine_v60he::~ScummEngine_v60he() { } } -#ifndef DISABLE_HE ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v60he(syst, dr) { if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 73)) @@ -735,8 +734,6 @@ ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr) else _resExtractor = new Win32ResExtractor(this); - _wiz = new Wiz(this); - _heV7RoomOffsets = NULL; _heSndSoundId = 0; @@ -756,19 +753,25 @@ ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr) ScummEngine_v70he::~ScummEngine_v70he() { delete _resExtractor; - delete _wiz; free(_heV7DiskOffsets); free(_heV7RoomIntOffsets); free(_heV7RoomOffsets); free(_storedFlObjects); } +#ifndef DISABLE_HE ScummEngine_v71he::ScummEngine_v71he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v70he(syst, dr) { _auxBlocksNum = 0; memset(_auxBlocks, 0, sizeof(_auxBlocks)); _auxEntriesNum = 0; memset(_auxEntries, 0, sizeof(_auxEntries)); + + _wiz = new Wiz(this); +} + +ScummEngine_v71he::~ScummEngine_v71he() { + delete _wiz; } ScummEngine_v72he::ScummEngine_v72he(OSystem *syst, const DetectorResult &dr) |