diff options
| author | Travis Howell | 2008-06-02 05:01:40 +0000 |
|---|---|---|
| committer | Travis Howell | 2008-06-02 05:01:40 +0000 |
| commit | 0f17e601013853a4076fceeb621590fd57026005 (patch) | |
| tree | decc9da6dd6186aadd2b4e1a770b7db9db9c50ab | |
| parent | 24156516ab29c900c1549c4356f6bbfa7cab5a28 (diff) | |
| download | scummvm-rg350-0f17e601013853a4076fceeb621590fd57026005.tar.gz scummvm-rg350-0f17e601013853a4076fceeb621590fd57026005.tar.bz2 scummvm-rg350-0f17e601013853a4076fceeb621590fd57026005.zip | |
GID_WATER is no longer required.
svn-id: r32486
| -rw-r--r-- | engines/scumm/detection_tables.h | 3 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 1 |
2 files changed, 1 insertions, 3 deletions
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, |