Add Amiga and DOS Italian versions of Gobliins 2, and resort gob2 entries by platform.

svn-id: r38193

1 files changed, 82 insertions, 47 deletions

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 25ab84b162..d1c76e7d09 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -369,60 +369,56 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesAdlib,
 		"intro"
 	},
-	{
+	{ // Supplied by fac76 in bug report #1883808
 		{
 			"gob2",
 			"",
-			AD_ENTRY1s("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275),
-			FR_FRA,
-			kPlatformPC,
+			AD_ENTRY1s("intro.stk", "eebf2810122cfd17399260cd1468e994", 554014),
+			EN_ANY,
+			kPlatformAmiga,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesAdlib,
+		kFeaturesNone,
 		"intro"
 	},
-	{ // Supplied by koalet in bug report #2478585
+	{
 		{
 			"gob2",
 			"",
-			{
-				{"intro.stk", 0, "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275},
-				{"musmac1.mid", 0, "7f96f491448c7a001b32df89cf8d2af2", 1658},
-				{NULL, 0, NULL, 0}
-			},
-			FR_FRA,
-			kPlatformMacintosh,
+			AD_ENTRY1("intro.stk", "d28b9e9b41f31acfa58dcd12406c7b2c"),
+			DE_DEU,
+			kPlatformAmiga,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesAdlib,
+		kFeaturesNone,
 		"intro"
 	},
-	{ // Supplied by arcepi in bug report #1659884
+	{ // Supplied by goodoldgeorg in bug report #2602057
 		{
 			"gob2",
 			"",
-			AD_ENTRY1s("intro.stk", "5f53c56e3aa2f1e76c2e4f0caa15887f", 829232),
-			ES_ESP,
-			kPlatformPC,
+			AD_ENTRY1("intro.stk", "686c88f7302a80b744aae9f8413e853d"),
+			IT_ITA,
+			kPlatformAmiga,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesAdlib,
+		kFeaturesNone,
 		"intro"
 	},
-	{
+	{ // Supplied by bgk in bug report #1706861
 		{
 			"gob2",
 			"",
-			AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"),
-			EN_GRB,
-			kPlatformPC,
+			AD_ENTRY1s("intro.stk", "4b13c02d1069b86bcfec80f4e474b98b", 554680),
+			FR_FRA,
+			kPlatformAtariST,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesAdlib,
+		kFeaturesNone,
 		"intro"
 	},
 	{ // Supplied by fac76 in bug report #1673397
@@ -442,6 +438,36 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesAdlib,
 		"intro"
 	},
+	{ // Supplied by koalet in bug report #2478585
+		{
+			"gob2",
+			"",
+			{
+				{"intro.stk", 0, "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275},
+				{"musmac1.mid", 0, "7f96f491448c7a001b32df89cf8d2af2", 1658},
+				{NULL, 0, NULL, 0}
+			},
+			FR_FRA,
+			kPlatformMacintosh,
+			ADGF_NO_FLAGS
+		},
+		kGameTypeGob2,
+		kFeaturesAdlib,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"),
+			EN_GRB,
+			kPlatformPC,
+			ADGF_NO_FLAGS
+		},
+		kGameTypeGob2,
+		kFeaturesAdlib,
+		"intro"
+	},
 	{
 		{
 			"gob2",
@@ -472,8 +498,8 @@ static const GOBGameDescription gameDescriptions[] = {
 		{
 			"gob2",
 			"",
-			AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"),
-			DE_DEU,
+			AD_ENTRY1s("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275),
+			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
@@ -481,12 +507,12 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesAdlib,
 		"intro"
 	},
-	{
+	{ // Supplied by blackwhiteeagle in bug report #1605235
 		{
 			"gob2",
 			"",
-			AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"),
-			RU_RUS,
+			AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"),
+			DE_DEU,
 			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
@@ -494,38 +520,38 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesAdlib,
 		"intro"
 	},
-	{ // Supplied by fac76 in bug report #1883808
+	{
 		{
 			"gob2",
 			"",
-			AD_ENTRY1s("intro.stk", "eebf2810122cfd17399260cd1468e994", 554014),
-			EN_ANY,
-			kPlatformAmiga,
+			AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"),
+			DE_DEU,
+			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesNone,
+		kFeaturesAdlib,
 		"intro"
 	},
-	{
+	{ // Supplied by goodoldgeorg in bug report #2602017
 		{
 			"gob2",
 			"",
-			AD_ENTRY1("intro.stk", "d28b9e9b41f31acfa58dcd12406c7b2c"),
-			DE_DEU,
-			kPlatformAmiga,
+			AD_ENTRY1("intro.stk", "c47faf1d406504e6ffe63243610bb1f4"),
+			IT_ITA,
+			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesNone,
+		kFeaturesAdlib,
 		"intro"
 	},
-	{ // Supplied by blackwhiteeagle in bug report #1605235
+	{
 		{
 			"gob2",
 			"",
-			AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"),
-			DE_DEU,
+			AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"),
+			RU_RUS,
 			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
@@ -533,17 +559,17 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesAdlib,
 		"intro"
 	},
-	{ // Supplied by bgk in bug report #1706861
+	{ // Supplied by arcepi in bug report #1659884
 		{
 			"gob2",
 			"",
-			AD_ENTRY1s("intro.stk", "4b13c02d1069b86bcfec80f4e474b98b", 554680),
-			FR_FRA,
-			kPlatformAtariST,
+			AD_ENTRY1s("intro.stk", "5f53c56e3aa2f1e76c2e4f0caa15887f", 829232),
+			ES_ESP,
+			kPlatformPC,
 			ADGF_NO_FLAGS
 		},
 		kGameTypeGob2,
-		kFeaturesNone,
+		kFeaturesAdlib,
 		"intro"
 	},
 	{
@@ -676,6 +702,15 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesNone,
 		"intro"
 	},
+
+
+
+
+
+
+
+
+
 	{ // Supplied by vampir_raziel in bug report #1658373
 		{
 			"ween",