[Scummvm-cvs-logs] CVS: scummvm/simon game.cpp,1.9,1.10 intern.h,1.48,1.49

[kirben]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26609/simon

Modified Files:
	game.cpp intern.h 
Log Message:

Uses wav format for sound, but is the DOS version of Simon 2.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/game.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- game.cpp	15 Nov 2005 23:48:06 -0000	1.9
+++ game.cpp	16 Nov 2005 12:28:06 -0000	1.10
@@ -171,6 +171,12 @@
 	{ GID_SIMON2TALKIE_HB, "de9dbc24158660e153483fa0cf6c3172", "stripped.txt", false},
 	{ GID_SIMON2TALKIE_HB, "2082f8d02075e590300478853a91ffd9", "tbllist", false},
 
+	{ GID_SIMON2TALKIE_IT, "3e11d400bea0638f360a724687005cd1", "gsptr30", false },
+	{ GID_SIMON2TALKIE_IT, "72096a62d36e6034ea9fecc13b2dbdab", "icon.dat", false},
+	{ GID_SIMON2TALKIE_IT, "344aca58e5ad5e25c517d5eb1d85c435", "simon2.gme", false },
+	{ GID_SIMON2TALKIE_IT, "bea6843fb9f3b2144fcb146d62db0b9a", "stripped.txt", false},
+	{ GID_SIMON2TALKIE_IT, "2082f8d02075e590300478853a91ffd9", "tbllist", false},
+
 	{ GID_SIMON2TALKIE_ES, "00000000000000000000000000000000", "gsptr30", false },
 	{ GID_SIMON2TALKIE_ES, "00000000000000000000000000000000", "icon.dat", false},
 	{ GID_SIMON2TALKIE_ES, "00000000000000000000000000000000", "simon2.gme", false },
@@ -189,12 +195,6 @@
 	{ GID_SIMON2WIN_DE,    "6de6292c9ac11bfb2e70fdb0f773ba85", "stripped.txt", false},
 	{ GID_SIMON2WIN_DE,    "2082f8d02075e590300478853a91ffd9", "tbllist", false},
 
-	{ GID_SIMON2WIN_IT, "3e11d400bea0638f360a724687005cd1", "gsptr30", false },
-	{ GID_SIMON2WIN_IT, "72096a62d36e6034ea9fecc13b2dbdab", "icon.dat", false},
-	{ GID_SIMON2WIN_IT, "344aca58e5ad5e25c517d5eb1d85c435", "simon2.gme", false },
-	{ GID_SIMON2WIN_IT, "bea6843fb9f3b2144fcb146d62db0b9a", "stripped.txt", false},
-	{ GID_SIMON2WIN_IT, "2082f8d02075e590300478853a91ffd9", "tbllist", false},
-
 	{ GID_FEEBLEFILES_2CD, "629762ea9ca9ee9ff85f4774d219f5c7", "game22", false },
 	{ GID_FEEBLEFILES_2CD, "0bbfee8e69739111eb36b0d138da8ddf", "tbllist", false},
 
@@ -527,6 +527,20 @@
 		Common::kPlatformPC,
 	},
 
+	// Simon the Sorcerer 2 - Italian DOS CD
+	{
+		"simon2",
+		GType_SIMON2,
+		GID_SIMON2TALKIE_IT,
+		"Simon the Sorcerer 2 (It DOS CD)",
+		ARRAYSIZE(SIMON2_GameFiles),
+		SIMON2_GameFiles,
+		GF_TALKIE,
+		Common::IT_ITA,
+		// FIXME: DOS version which uses WAV format
+		Common::kPlatformWindows,
+	},
+
 	// Simon the Sorcerer 2 - Spanish DOS CD
 	{
 		"simon2",
@@ -566,19 +580,6 @@
 		Common::kPlatformWindows,
 	},
 
-	// Simon the Sorcerer 2 - Italian Windows CD
-	{
-		"simon2",
-		GType_SIMON2,
-		GID_SIMON2WIN_IT,
-		"Simon the Sorcerer 2 (It Windows CD)",
-		ARRAYSIZE(SIMON2_GameFiles),
-		SIMON2_GameFiles,
-		GF_TALKIE,
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-	},
-
 	// The Feeble Files - English 2CD
 	{
 		"feeble",

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- intern.h	14 Nov 2005 23:50:36 -0000	1.48
+++ intern.h	16 Nov 2005 12:28:06 -0000	1.49
@@ -185,10 +185,10 @@
 	GID_SIMON2TALKIE_DE,
 	GID_SIMON2TALKIE_FR,
 	GID_SIMON2TALKIE_HB,
+	GID_SIMON2TALKIE_IT,
 	GID_SIMON2TALKIE_ES,
 	GID_SIMON2WIN,
 	GID_SIMON2WIN_DE,
-	GID_SIMON2WIN_IT,
 
 	GID_FEEBLEFILES_2CD,
 	GID_FEEBLEFILES_4CD,