diff options
| author | Travis Howell | 2003-08-06 05:47:49 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-06 05:47:49 +0000 |
| commit | 43a1d35064d048895edf6211831e700b8f79a118 (patch) | |
| tree | 5ba52925d12030eefca55175e4a5b5810b03a04f | |
| parent | 0c3c6094420787c4f4cbd86a0ebe41c2ade838ee (diff) | |
| download | scummvm-rg350-43a1d35064d048895edf6211831e700b8f79a118.tar.gz scummvm-rg350-43a1d35064d048895edf6211831e700b8f79a118.tar.bz2 scummvm-rg350-43a1d35064d048895edf6211831e700b8f79a118.zip | |
Reverted too much
Add note about missing code in simon
svn-id: r9531
| -rw-r--r-- | scumm/scummvm.cpp | 16 | ||||
| -rw-r--r-- | simon/simon.cpp | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index b94b7785f7..1548b78553 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -115,21 +115,21 @@ static const VersionSettings scumm_settings[] = { GF_USE_KEY | GF_ADLIB_DEFAULT, 0}, /* Scumm Version 6 */ - {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, VersionSettings::ADLIB_PREFERRED, + {"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS, 0}, - {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"funpack", "Putt-Putt's Fun Pack", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"funpack", "Putt-Putt's Fun Pack", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"fbpack", "Fatty Bear's Fun Pack", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"fbpack", "Fatty Bear's Fun Pack", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_PREFERRED, + {"fbdemo", "Fatty Bear's Birthday Surprise (DOS Demo)", GID_PUTTPUTT, 6, VersionSettings::ADLIB_DONT_CARE, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, {"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, VersionSettings::ADLIB_PREFERRED, GF_NEW_OPCODES | GF_USE_KEY | GF_ADLIB_DEFAULT, 0}, diff --git a/simon/simon.cpp b/simon/simon.cpp index a10a77aada..45aaf88c18 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1761,9 +1761,11 @@ void SimonEngine::f10_key() { timer_vga_sprites(); do { - if (ha->id != 0 && ha->flags & 0x20 && !(ha->flags & 0x40) && ha->flags & 1) { - if (_game & GF_SIMON2) - if (ha->y >= 0xc8 || ha->y >= _vga_var8) + if (ha->id != 0 && ha->flags & 0x20 && !(ha->flags & 0x40)) { + + /* XXX: add code to skip inventory and verbs area */ + + if (ha->y >= 0xc8) continue; y_ = (ha->height >> 1) - 4 + ha->y; |