[Scummvm-git-logs] scummvm master -> 497b8b4df5aa0e7d7217878bc24367bcfd521c75

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
497b8b4df5 GLK: FROTZ: Change GameID to avoid Conflict with Pegasus Prime Engine


Commit: 497b8b4df5aa0e7d7217878bc24367bcfd521c75
    https://github.com/scummvm/scummvm/commit/497b8b4df5aa0e7d7217878bc24367bcfd521c75
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-15T09:53:28+01:00

Commit Message:
GLK: FROTZ: Change GameID to avoid Conflict with Pegasus Prime Engine

The game id "pegasus" was already used for the Journeyman Project Pegasus
Prime engine, so this caused a detection conflict.

Fixes bug #11146.

Changed paths:
    engines/glk/frotz/detection_tables.h


diff --git a/engines/glk/frotz/detection_tables.h b/engines/glk/frotz/detection_tables.h
index 779e8eb..ea16047 100644
--- a/engines/glk/frotz/detection_tables.h
+++ b/engines/glk/frotz/detection_tables.h
@@ -519,7 +519,7 @@ const PlainGameDescriptor ZCODE_GAME_LIST[] = {
 	{ "parc",              "Parc" },
 	{ "pathway",           "Pathway to Destruction" },
 	{ "peacock",           "Not Made With Hands" },
-	{ "pegasus",           "Pegasus" },
+	{ "zpegasus",          "Pegasus" },
 	{ "pentari",           "Pentari" },
 	{ "perilousmagic",     "Perilous Magic" },
 	{ "perrysworld",       "Perry's World" },
@@ -1557,7 +1557,7 @@ const FrotzGameDescription FROTZ_GAMES[] = {
 	ENTRY0("parc", "111115", "bd8698030864dacbf494226fc6b9dd0c", 98816),
 	ENTRY0("pathway", "080511", "8eb9bc735afa30d84fd4f913fc29bbc3", 264192),
 	ENTRY0("peacock", "000208", "5a4cdec49d14f905013ad9ae35ba17f8", 78336),
-	ENTRY0("pegasus", "130708", "f65a086805d473b3ccbfb9971383ef65", 417200),
+	ENTRY0("zpegasus", "130708", "f65a086805d473b3ccbfb9971383ef65", 417200),
 	ENTRY0("pentari", "030206", "3879d37f7417f6ce2a0acb96faf00c86", 91136),
 	ENTRY0("perilousmagic", "990821", "56901ae08078fc15fb74a50e48101bbf", 66560),
 	ENTRY0("perrysworld", "070501", "6466fe74c657f960521237d5a3274b05", 124300),