Moved unrelated fields out of ADGameDescription structure.

svn-id: r24090

1 files changed, 78 insertions, 78 deletions

diff --git a/engines/saga/sagagame.cpp b/engines/saga/sagagame.cpp
index 56e2b95207..06d85ff8ff 100644
--- a/engines/saga/sagagame.cpp
+++ b/engines/saga/sagagame.cpp
@@ -818,15 +818,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_DEMO_G, // Game id
 			"Demo", // Game title
 			ARRAYSIZE(ITE_DEMO_G_GameFiles), // Game datafiles
 			ITE_DEMO_G_GameFiles,
-			0, // features
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_DEMO_G, // Game id
+		0, // features
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE, // Starting scene number
 		&ITEDemo_Resources,
@@ -843,15 +843,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_MACDEMO2,
 			"Demo",
 			ARRAYSIZE(ITE_MACDEMO2_GameFiles),
 			ITE_MACDEMO2_GameFiles,
-			GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 		},
+		GType_ITE,
+		GID_ITE_MACDEMO2,
+		GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -868,15 +868,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_MACDEMO1,
 			"early Demo",
 			ARRAYSIZE(ITE_MACDEMO1_GameFiles),
 			ITE_MACDEMO1_GameFiles,
-			GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 		},
+		GType_ITE,
+		GID_ITE_MACDEMO1,
+		GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -893,15 +893,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_MACCD_G,
 			"CD",
 			ARRAYSIZE(ITE_MACCD_G_GameFiles),
 			ITE_MACCD_G_GameFiles,
-			GF_BIG_ENDIAN_DATA | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 		},
+		GType_ITE,
+		GID_ITE_MACCD_G,
+		GF_BIG_ENDIAN_DATA | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -918,15 +918,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_MACCD,
 			"Wyrmkeep CD",
 			ARRAYSIZE(ITE_MACCD_GameFiles),
 			ITE_MACCD_GameFiles,
-			GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 		},
+		GType_ITE,
+		GID_ITE_MACCD,
+		GF_BIG_ENDIAN_DATA | GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -944,15 +944,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_LINDEMO,
 			"Demo",
 			ARRAYSIZE(ITE_LINDEMO_GameFiles),
 			ITE_LINDEMO_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 			Common::EN_ANY,
 			Common::kPlatformLinux,
 		},
+		GType_ITE,
+		GID_ITE_LINDEMO,
+		GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -969,15 +969,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_WINDEMO2,
 			"Demo",
 			ARRAYSIZE(ITE_WINDEMO2_GameFiles),
 			ITE_WINDEMO2_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
+		GType_ITE,
+		GID_ITE_WINDEMO2,
+		GF_WYRMKEEP | GF_CD_FX | GF_SCENE_SUBSTITUTES,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -994,15 +994,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_WINDEMO1,
 			"early Demo",
 			ARRAYSIZE(ITE_WINDEMO1_GameFiles),
 			ITE_WINDEMO1_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
+		GType_ITE,
+		GID_ITE_WINDEMO1,
+		GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1019,15 +1019,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_MULTICD,
 			"Multi-OS CD Version",
 			ARRAYSIZE(ITE_MULTICD_GameFiles),
 			ITE_MULTICD_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformUnknown,
 		},
+		GType_ITE,
+		GID_ITE_MULTICD,
+		GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1044,15 +1044,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_LINCD,
 			"CD Version",
 			ARRAYSIZE(ITE_LINCD_GameFiles),
 			ITE_LINCD_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformLinux,
 		},
+		GType_ITE,
+		GID_ITE_LINCD,
+		GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1069,15 +1069,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_WINCD,
 			"CD Version",
 			ARRAYSIZE(ITE_WINCD_GameFiles),
 			ITE_WINCD_GameFiles,
-			GF_WYRMKEEP | GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
+		GType_ITE,
+		GID_ITE_WINCD,
+		GF_WYRMKEEP | GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1094,15 +1094,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_CD_G,
 			"CD Version",
 			ARRAYSIZE(ITE_CD_G_GameFiles),
 			ITE_CD_G_GameFiles,
-			GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_CD_G,
+		GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1119,15 +1119,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_CD_G2,
 			"CD Version",
 			ARRAYSIZE(ITE_CD_G2_GameFiles),
 			ITE_CD_G2_GameFiles,
-			GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_CD_G2,
+		GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1144,15 +1144,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_CD_DE,
 			"CD Version",
 			ARRAYSIZE(ITE_CD_DE_GameFiles),
 			ITE_CD_DE_GameFiles,
-			GF_CD_FX,
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_CD_DE,
+		GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1169,15 +1169,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_CD_DE2,
 			"CD Version",
 			ARRAYSIZE(ITE_CD_DE2_GameFiles),
 			ITE_CD_DE2_GameFiles,
-			GF_CD_FX,
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_CD_DE2,
+		GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1194,15 +1194,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_CD,
 			"CD Version",
 			ARRAYSIZE(ITE_CD_GameFiles),
 			ITE_CD_GameFiles,
-			GF_CD_FX,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_CD,
+		GF_CD_FX,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1219,15 +1219,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_DISK_DE,
 			"Floppy",
 			ARRAYSIZE(ITE_DISK_DE_GameFiles),
 			ITE_DISK_DE_GameFiles,
-			0,
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_DISK_DE,
+		0,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1244,15 +1244,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_DISK_DE2,
 			"Floppy",
 			ARRAYSIZE(ITE_DISK_DE2_GameFiles),
 			ITE_DISK_DE2_GameFiles,
-			0,
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_DISK_DE2,
+		0,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1269,15 +1269,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_DISK_G,
 			"Floppy",
 			ARRAYSIZE(ITE_DISK_G_GameFiles),
 			ITE_DISK_G_GameFiles,
-			0,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_DISK_G,
+		0,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1294,15 +1294,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ite",
-			GType_ITE,
-			GID_ITE_DISK_G2,
 			"Floppy",
 			ARRAYSIZE(ITE_DISK_G2_GameFiles),
 			ITE_DISK_G2_GameFiles,
-			0,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_ITE,
+		GID_ITE_DISK_G2,
+		0,
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,
 		&ITE_Resources,
@@ -1319,15 +1319,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_DEMO,
 			"Demo",
 			ARRAYSIZE(IHNM_DEMO_GameFiles),
 			IHNM_DEMO_GameFiles,
-			0,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_DEMO,
+		0,
 		&IHNM_DisplayInfo,
 		0,
 		&IHNM_Resources,
@@ -1344,15 +1344,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_CD,
 			"",
 			ARRAYSIZE(IHNM_CD_GameFiles),
 			IHNM_CD_GameFiles,
-			0,
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_CD,
+		0,
 		&IHNM_DisplayInfo,
 		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
@@ -1369,15 +1369,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_CD_DE,
 			"",
 			ARRAYSIZE(IHNM_CD_DE_GameFiles),
 			IHNM_CD_DE_GameFiles,
-			0,
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_CD_DE,
+		0,
 		&IHNM_DisplayInfo,
 		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
@@ -1394,15 +1394,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_CD_ES,
 			"",
 			ARRAYSIZE(IHNM_CD_ES_GameFiles),
 			IHNM_CD_ES_GameFiles,
-			0,
 			Common::ES_ESP,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_CD_ES,
+		0,
 		&IHNM_DisplayInfo,
 		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
@@ -1419,15 +1419,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_CD_RU,
 			"",
 			ARRAYSIZE(IHNM_CD_RU_GameFiles),
 			IHNM_CD_RU_GameFiles,
-			0,
 			Common::RU_RUS,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_CD_RU,
+		0,
 		&IHNM_DisplayInfo,
 		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,
@@ -1444,15 +1444,15 @@ static SAGAGameDescription gameDescriptions[] = {
 	{
 		{
 			"ihnm",
-			GType_IHNM,
-			GID_IHNM_CD_FR,
 			"",
 			ARRAYSIZE(IHNM_CD_FR_GameFiles),
 			IHNM_CD_FR_GameFiles,
-			0,
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
+		GType_IHNM,
+		GID_IHNM_CD_FR,
+		0,
 		&IHNM_DisplayInfo,
 		IHNM_DEFAULT_SCENE,
 		&IHNM_Resources,