From 0f17e601013853a4076fceeb621590fd57026005 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 2 Jun 2008 05:01:40 +0000
Subject: GID_WATER is no longer required.

svn-id: r32486
---
 engines/scumm/detection_tables.h | 3 +--
 engines/scumm/scumm.h            | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 24765ca83a..8c193974e5 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -286,8 +286,7 @@ static const GameSettings gameVariantsTable[] = {
 	{"dog", "", 0, GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY, UNK},
 	{"maze", "", 0, GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY, UNK},
 
-	{"water", "",      0, GID_WATER, 6, 80, MDT_NONE, GF_USE_KEY, UNK},
-	{"water", "HE 99", 0, GID_WATER, 6, 99, MDT_NONE, GF_USE_KEY, UNK},
+	{"water", "",      0, GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY, UNK},
 
 	// condMaskCode value changed in setUserCondition & setTalkCondition
 	{"putttime", "", 0, GID_HEGAME, 6, 85, MDT_NONE, GF_USE_KEY, UNK},
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 26b6aa6e2f..20824ffe74 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -221,7 +221,6 @@ enum ScummGameId {
 	GID_FBEAR,
 	GID_FUNPACK,
 	GID_FREDDI3,
-	GID_WATER,
 	GID_PUTTRACE,
 	GID_FUNSHOP,	// Used for all three funshops
 	GID_FOOTBALL,
-- 
cgit v1.2.3