diff options
| author | Travis Howell | 2004-03-02 06:04:38 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-03-02 06:04:38 +0000 |
| commit | 5fbc3497c1b5b63b934a83e900958fe96ed040dd (patch) | |
| tree | b0781ffea158a237b11092603e2fc967d5d4b1d9 | |
| parent | 2f65abff2f3a78fd0874567eb432470de4c6d39a (diff) | |
| download | scummvm-rg350-5fbc3497c1b5b63b934a83e900958fe96ed040dd.tar.gz scummvm-rg350-5fbc3497c1b5b63b934a83e900958fe96ed040dd.tar.bz2 scummvm-rg350-5fbc3497c1b5b63b934a83e900958fe96ed040dd.zip | |
Avoid duplicate targets
svn-id: r13135
| -rw-r--r-- | scumm/resource.cpp | 8 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 9f573ffe0c..65cb582e84 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -80,7 +80,7 @@ void ScummEngine::openRoom(int room) { } if (!(_features & GF_SMALL_HEADER)) { - if (_features & GF_AFTER_HEV7) { + if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) { sprintf(buf, "%s.he%.1d", _gameName.c_str(), room == 0 ? 0 : 1); } else if (_version >= 7) { if (room > 0 && (_version == 8)) @@ -185,7 +185,7 @@ void ScummEngine::readRoomsOffsets() { if (_features & GF_SMALL_NAMES) return; - if (_features & GF_AFTER_HEV7) { + if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) { num = READ_LE_UINT16(_HEV7RoomOffsets); ptr = _HEV7RoomOffsets + 2; for (i = 0; i < num; i++) { @@ -346,7 +346,7 @@ void ScummEngine::readIndexFile() { _objectStateTable[i] = _objectOwnerTable[i] >> OF_STATE_SHL; _objectOwnerTable[i] &= OF_OWNER_MASK; } - if (_features & GF_AFTER_HEV7) { + if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) { // _objectRoomTable _fileHandle.seek(num * 4, SEEK_CUR); //_fileHandle.read(_objectRoomTable, num * 4); @@ -496,7 +496,7 @@ void ScummEngine::readResTypeList(int id, uint32 tag, const char *name) { for (i = 0; i < num; i++) { res.roomoffs[id][i] = _fileHandle.readUint32LE(); } - if (_features & GF_AFTER_HEV7) { + if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) { _fileHandle.seek(4 * num, SEEK_CUR); // FIXME what are these additional offsets } } diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index c2af7c1aac..9011a0e76e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -212,12 +212,6 @@ static const ScummGameSettings scumm_settings[] = { // Humongous Entertainment Scumm Version 7 //{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE, // GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"puttwin", "Putt-Putt Joins The Parade (Windows)", GID_PUTTPUTT, 6, MDT_NONE, - GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "puttputt"}, - {"moonwin", "Putt-Putt Goes To The Moon (Windows)", GID_PUTTPUTT, 6, MDT_NONE, - GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "puttmoon"}, - {"fbearwin", "Fatty Bear's Birthday Surprise (Windows)", GID_PUTTPUTT, 6, MDT_NONE, - GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "fbear"}, //{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE, // GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, //{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE, |