DRASCULA: Reorder detection entries

Entries have been grouped by type (packed / unpacked) and ordered by
language, alphabetically

1 files changed, 67 insertions, 62 deletions

diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index e7ffeffd0c..1917bc879d 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -68,33 +68,57 @@ static const PlainGameDescriptor drasculaGames[] = {
 namespace Drascula {
 
 static const DrasculaGameDescription gameDescriptions[] = {
+
+	//// Packed versions //////////////////////////////////////////////////////
+
 	{
-		// Drascula English version
+		// Drascula English version (original packed files)
 		{
 			"drascula",
 			0,
-			AD_ENTRY1s("14.ald", "09b2735953edcd43af115c65ae00b10e", 1595),
+			{
+				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
+				// HACK: List packet.001 twice to ensure this detector entry
+				// is ranked just as high as the others (which each have two
+				// detection files).
+				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
+				{NULL, 0, NULL, 0}
+			},
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			GF_PACKED,
 			GUIO0()
 		},
 	},
 
 	{
-		// Drascula English version (original packed files)
+		// Drascula French version (original packed files)
 		{
 			"drascula",
 			0,
 			{
 				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				// HACK: List packet.001 twice to ensure this detector entry
-				// is ranked just as high as the others (which each have two
-				// detection files).
+				{"packet.002", 1, "4401123400f22f212b89f15fb4b43013", 721122},
+				{NULL, 0, NULL, 0}
+			},
+			Common::FR_FRA,
+			Common::kPlatformDOS,
+			GF_PACKED,
+			GUIO0()
+		},
+	},
+
+	{
+		// Drascula French version (ScummVM repacked files)
+		{
+			"drascula",
+			0,
+			{
 				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
+				{"packet.002", 1, "7b83cedb9bb326ed5143e5c459508d43", 722383},
 				{NULL, 0, NULL, 0}
 			},
-			Common::EN_ANY,
+			Common::FR_FRA,
 			Common::kPlatformDOS,
 			GF_PACKED,
 			GUIO0()
@@ -119,16 +143,29 @@ static const DrasculaGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Drascula French version (original packed files)
+		// Drascula Italian version (original packed version)
+		{
+			"drascula",
+			0,
+			AD_ENTRY1s("packet.001", "0253e924af223f5fe52537023385159b", 32564209),
+			Common::IT_ITA,
+			Common::kPlatformDOS,
+			GF_PACKED,
+			GUIO0()
+		},
+	},
+
+	{
+		// Drascula Italian version (ScummVM repacked files)
 		{
 			"drascula",
 			0,
 			{
 				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				{"packet.002", 1, "4401123400f22f212b89f15fb4b43013", 721122},
+				{"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623},
 				{NULL, 0, NULL, 0}
 			},
-			Common::FR_FRA,
+			Common::IT_ITA,
 			Common::kPlatformDOS,
 			GF_PACKED,
 			GUIO0()
@@ -149,25 +186,31 @@ static const DrasculaGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Drascula Spanish version
+		// Drascula Spanish version (ScummVM repacked files)
 		{
 			"drascula",
 			0,
-			AD_ENTRY1s("14.ald", "0746ed1a5cc8d9728f790c29813f4b43", 23059),
+			{
+				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
+				{"packet.004", 1, "a289d3cf80d50f25ec569b653248437e", 17205838},
+				{NULL, 0, NULL, 0}
+			},
 			Common::ES_ESP,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			GF_PACKED,
 			GUIO0()
 		},
 	},
 
+	//// Unpacked versions ////////////////////////////////////////////////////
+
 	{
-		// Drascula German version
+		// Drascula English version
 		{
 			"drascula",
 			0,
-			AD_ENTRY1s("14.ald", "72e46089033d56bad1c179ac36e2a9d2", 610),
-			Common::DE_DEU,
+			AD_ENTRY1s("14.ald", "09b2735953edcd43af115c65ae00b10e", 1595),
+			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO0()
@@ -201,14 +244,14 @@ static const DrasculaGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Drascula Italian version (original packed version)
+		// Drascula German version
 		{
 			"drascula",
 			0,
-			AD_ENTRY1s("packet.001", "0253e924af223f5fe52537023385159b", 32564209),
-			Common::IT_ITA,
+			AD_ENTRY1s("14.ald", "72e46089033d56bad1c179ac36e2a9d2", 610),
+			Common::DE_DEU,
 			Common::kPlatformDOS,
-			GF_PACKED,
+			ADGF_NO_FLAGS,
 			GUIO0()
 		},
 	},
@@ -240,52 +283,14 @@ static const DrasculaGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Drascula Spanish version (ScummVM repacked files)
+		// Drascula Spanish version
 		{
 			"drascula",
 			0,
-			{
-				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				{"packet.004", 1, "a289d3cf80d50f25ec569b653248437e", 17205838},
-				{NULL, 0, NULL, 0}
-			},
+			AD_ENTRY1s("14.ald", "0746ed1a5cc8d9728f790c29813f4b43", 23059),
 			Common::ES_ESP,
 			Common::kPlatformDOS,
-			GF_PACKED,
-			GUIO0()
-		},
-	},
-
-	{
-		// Drascula Italian version (ScummVM repacked files)
-		{
-			"drascula",
-			0,
-			{
-				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				{"packet.005", 1, "58caac54b891f5d7f335e710e45e5d29", 16209623},
-				{NULL, 0, NULL, 0}
-			},
-			Common::IT_ITA,
-			Common::kPlatformDOS,
-			GF_PACKED,
-			GUIO0()
-		},
-	},
-
-	{
-		// Drascula French version (ScummVM repacked files)
-		{
-			"drascula",
-			0,
-			{
-				{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
-				{"packet.002", 1, "7b83cedb9bb326ed5143e5c459508d43", 722383},
-				{NULL, 0, NULL, 0}
-			},
-			Common::FR_FRA,
-			Common::kPlatformDOS,
-			GF_PACKED,
+			ADGF_NO_FLAGS,
 			GUIO0()
 		},
 	},