From 151a2dcc44fd0f58d66b58c53693eac1fbf3e7f6 Mon Sep 17 00:00:00 2001
From: Jonathan Gray
Date: Tue, 18 Nov 2003 10:16:49 +0000
Subject: revert use of GF_DEMO in Humongous games fixing several problems

svn-id: r11345
---
 scumm/script_v6.cpp | 2 +-
 scumm/scumm.h       | 1 +
 scumm/scummvm.cpp   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index dd14ddfb05..55cec793a2 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -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());
 }
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 7b018375d6..0d13c46718 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -189,6 +189,7 @@ enum ScummGameId {
 	GID_MANIAC,
 	GID_ZAK,
 	GID_PUTTPUTT,
+	GID_PUTTDEMO,
 	GID_PJSDEMO,
 	GID_MONKEY_SEGA
 };
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 590b0bdb54..f13110adb4 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -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,
-- 
cgit v1.2.3