[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.89,1.90 saga.h,1.115,1.116

[Eugene Sandulenko]

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

Modified Files:
	game.cpp saga.h 
Log Message:
Remove support of dumped data forks for old ITE Mac CD. Now it requires
files to be in macbinary format.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- game.cpp	4 Aug 2005 10:50:42 -0000	1.89
+++ game.cpp	4 Aug 2005 12:11:56 -0000	1.90
@@ -711,17 +711,11 @@
 	{ GID_ITE_MACCD,    "95863b89a0916941f6c5e1789843ba14", "sounds.rsc", false },
 	{ GID_ITE_MACCD,    "c14c4c995e7a0d3828e3812a494301b7", "Inherit the Earth Voices", true },
 
-	{ GID_ITE_MACCD_G,  "4f7fa11c5175980ed593392838523060", "ITE Resources", true },
-	{ GID_ITE_MACCD_G,  "adf1f46c1d0589083996a7060c798ad0", "ITE Scripts", true },
-	{ GID_ITE_MACCD_G,  "d41d8cd98f00b204e9800998ecf8427e", "ITE Music", true },
-	{ GID_ITE_MACCD_G,  "8ee4d9ee27688785608d09faaa4a974c", "ITE Sounds", true },
-	{ GID_ITE_MACCD_G,  "3a1463f0c6a41381e98c2a8c55308190", "ITE Voices", true },
-
-	{ GID_ITE_MACCD2_G,  "0bd506aa887bfc7965f695c6bd28237d", "ITE Resources.bin", true },
-	{ GID_ITE_MACCD2_G,  "af0d7a2588e09ad3ecbc5b474ea238bf", "ITE Scripts.bin", true },
-	{ GID_ITE_MACCD2_G,  "c1d20324b7cdf1650e67061b8a93251c", "ITE Music.bin", true },
-	{ GID_ITE_MACCD2_G,  "441426c6bb2a517f65c7e49b57f7a345", "ITE Sounds.bin", true },
-	{ GID_ITE_MACCD2_G,  "dba92ae7d57e942250fe135609708369", "ITE Voices.bin", true },
+	{ GID_ITE_MACCD_G,  "0bd506aa887bfc7965f695c6bd28237d", "ITE Resources.bin", true },
+	{ GID_ITE_MACCD_G,  "af0d7a2588e09ad3ecbc5b474ea238bf", "ITE Scripts.bin", true },
+	{ GID_ITE_MACCD_G,  "c1d20324b7cdf1650e67061b8a93251c", "ITE Music.bin", true },
+	{ GID_ITE_MACCD_G,  "441426c6bb2a517f65c7e49b57f7a345", "ITE Sounds.bin", true },
+	{ GID_ITE_MACCD_G,  "dba92ae7d57e942250fe135609708369", "ITE Voices.bin", true },
 
 	{ GID_ITE_LINCD,    "8f4315a9bb10ec839253108a032c8b54", "ite.rsc", false },
 	{ GID_ITE_LINCD,    "a891405405edefc69c9d6c420c868b84", "scripts.rsc", false },
@@ -868,30 +862,9 @@
 
 	// Inherit the earth - MAC CD Guild version
 	{
-		"ite-demo",
-		GType_ITE,
-		GID_ITE_MACCD_G,
-		"Inherit the Earth (MAC CD)",
-		&ITE_DisplayInfo,
-		ITE_DEFAULT_SCENE,
-		&ITE_Resources,
-		ARRAYSIZE(ITEMACCD_G_GameFiles),
-		ITEMACCD_G_GameFiles,
-		ARRAYSIZE(ITEWINDEMO_GameFonts),
-		ITEWINDEMO_GameFonts,
-		&ITEMACCD_G_GameSound,
-		&ITEMACCD_G_GameSound,
-		NULL,
-		NULL,
-		0,
-		GF_BIG_ENDIAN_DATA | GF_MAC_RESOURCES | GF_CD_FX
-	},
-
-	// Inherit the earth - MAC CD Guild version
-	{
 		"ite",
 		GType_ITE,
-		GID_ITE_MACCD2_G,
+		GID_ITE_MACCD_G,
 		"Inherit the Earth (MAC CD)",
 		&ITE_DisplayInfo,
 		ITE_DEFAULT_SCENE,

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- saga.h	4 Aug 2005 10:29:29 -0000	1.115
+++ saga.h	4 Aug 2005 12:11:57 -0000	1.116
@@ -253,7 +253,6 @@
 	GID_ITE_DISK_G,
 	GID_ITE_CD_G,
 	GID_ITE_MACCD_G,
-	GID_ITE_MACCD2_G,
 
 	// Wyrmkeep
 	GID_ITE_CD,       // data for Win rerelease is same as in old DOS