revert use of GF_DEMO in Humongous games fixing several problems

svn-id: r11345
This commit is contained in:
Jonathan Gray 2003-11-18 10:16:49 +00:00
parent a35ce0f5ae
commit 151a2dcc44
3 changed files with 4 additions and 3 deletions

View File

@ -927,7 +927,7 @@ void ScummEngine_v6::o6_getOwner() {
}
void ScummEngine_v6::o6_startSound() {
if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTPUTT) && (!(_features & GF_DEMO)))
if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
pop(); // offset which seems to always be zero
_sound->addSoundToQueue(pop());
}

View File

@ -189,6 +189,7 @@ enum ScummGameId {
GID_MANIAC,
GID_ZAK,
GID_PUTTPUTT,
GID_PUTTDEMO,
GID_PJSDEMO,
GID_MONKEY_SEGA
};

View File

@ -152,8 +152,8 @@ static const ScummGameSettings scumm_settings[] = {
/* Scumm Version 6 */
{"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES},
{"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
GF_DEMO | GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS},
{"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS},
{"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES},
{"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,