diff options
| -rw-r--r-- | gameDetector.cpp | 4 | ||||
| -rw-r--r-- | script_v1.cpp | 2 | ||||
| -rw-r--r-- | sound.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp index 4ce9ef2c1b..1b6f4eeb10 100644 --- a/gameDetector.cpp +++ b/gameDetector.cpp @@ -267,7 +267,7 @@ static const VersionSettings version_settings[] = { /* Scumm version 5 */ {"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA, 5, 0, 16, - GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT | GF_NO_SCALLING}, + GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT}, {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42, GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT}, {"monkey", "Monkey Island 1", GID_MONKEY, 5, 2, 2, @@ -287,7 +287,7 @@ static const VersionSettings version_settings[] = { {"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, 3, 2, GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_ADLIB_DEFAULT}, {"samnmax", "Sam & Max", GID_SAMNMAX, 6, 4, 2, - GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER}, + GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY | GF_DRAWOBJ_OTHER_ORDER | GF_ADLIB_DEFAULT}, {"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 3, 0, GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY}, diff --git a/script_v1.cpp b/script_v1.cpp index 4b0b0c711e..60919544fa 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -778,7 +778,7 @@ void Scumm::o5_actorSet() a->width = getVarOrDirectByte(0x80); break; case 17: /* scale */ - if (_gameId & GID_MONKEY_VGA) { + if (_gameId == GID_MONKEY_VGA) { a->scalex = a->scaley = getVarOrDirectByte(0x80); } else { a->scalex = getVarOrDirectByte(0x80); @@ -118,7 +118,7 @@ void Scumm::playSound(int sound) return; } - if (_features & GF_OLD256) + if ((_features & GF_OLD256) || (_gameId == GID_MONKEY_VGA)) return; /* FIXME */ if (se) { |