Project: ScummVM

Revision: 34693

Author: fingolfin

Date: 30 Sep 2008 05:08:17

• /scummvm/trunk/engines/saga/rscfile.cpp

  ......	@@ -263,7 +263,6 @@
  263	263
  264	264	bool Resource::loadContext(ResourceContext *context) {
  265	265	size_t i;
  266		int j;
  267	266	const GamePatchDescription *patchDescription;
  268	267	ResourceData *resourceData;
  269	268	uint16 subjectResourceType;
  ......	@@ -320,8 +319,7 @@
  320	319	}
  321	320
  322	321	//process external patch files
  323		for (j = 0; j < _vm->getPatchesCount(); j++) {
  324		patchDescription = &_vm->getPatchDescriptions()[j];
  	322	for (patchDescription = _vm->getPatchDescriptions(); patchDescription->fileName; ++patchDescription) {
  325	323	if ((patchDescription->fileType & context->fileType) != 0) {
  326	324	if (patchDescription->resourceId < context->count) {
  327	325	resourceData = &context->table[patchDescription->resourceId];

• /scummvm/trunk/engines/saga/detection_tables.h

  ......	@@ -160,7 +160,8 @@
  160	160	{ "credit4n.dlt", GAME_RESOURCEFILE, 1797, NULL}, // PC
  161	161	{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, // Macintosh
  162	162	{ "p2_a.voc", GAME_VOICEFILE, 4, NULL},
  163		{ "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound}
  	163	{ "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound},
  	164	{ NULL, 0, 0, NULL}
  164	165	};
  165	166
  166	167	static const GamePatchDescription ITEMacPatch_Files[] = {
  ......	@@ -171,7 +172,8 @@
  171	172	{ "wyrm4.dlt", GAME_RESOURCEFILE, 1533, NULL},
  172	173	{ "credit3m.dlt", GAME_RESOURCEFILE, 1796, NULL},
  173	174	{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL},
  174		{ "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound}
  	175	{ "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound},
  	176	{ NULL, 0, 0, NULL}
  175	177	};
  176	178
  177	179	static const SAGAGameDescription gameDescriptions[] = {
  ......	@@ -209,7 +211,6 @@
  209	211	ITEDEMO_GameFonts,
  210	212	&ITEDISK_GameSound,
  211	213	&ITEDISK_GameSound,
  212		0,
  213	214	NULL,
  214	215	},
  215	216
  ......	@@ -237,7 +238,6 @@
  237	238	ITEWINDEMO_GameFonts,
  238	239	&ITEDEMO_GameVoice,
  239	240	&MAC_GameSound,
  240		ARRAYSIZE(ITEMacPatch_Files),
  241	241	ITEMacPatch_Files,
  242	242	},
  243	243
  ......	@@ -266,7 +266,6 @@
  266	266	ITEWINDEMO_GameFonts,
  267	267	&ITEDEMO_GameVoice,
  268	268	&MAC_GameSound,
  269		ARRAYSIZE(ITEMacPatch_Files),
  270	269	ITEMacPatch_Files,
  271	270	},
  272	271
  ......	@@ -295,7 +294,6 @@
  295	294	ITEWINDEMO_GameFonts,
  296	295	&ITEDEMO_GameVoice,
  297	296	&ITEPC_GameSound,
  298		ARRAYSIZE(ITEPatch_Files),
  299	297	ITEPatch_Files,
  300	298	},
  301	299
  ......	@@ -324,7 +322,6 @@
  324	322	ITEWINDEMO_GameFonts,
  325	323	&ITEWINDEMO1_GameSound,
  326	324	&ITEWINDEMO1_GameSound,
  327		ARRAYSIZE(ITEPatch_Files),
  328	325	ITEPatch_Files,
  329	326	},
  330	327
  ......	@@ -360,7 +357,6 @@
  360	357	ITEWINDEMO_GameFonts,
  361	358	&ITEMACCD_G_GameSound,
  362	359	&ITEMACCD_G_GameSound,
  363		0,
  364	360	NULL,
  365	361	},
  366	362
  ......	@@ -387,7 +383,6 @@
  387	383	ITEWINDEMO_GameFonts,
  388	384	&MAC_GameSound,
  389	385	&MAC_GameSound,
  390		ARRAYSIZE(ITEMacPatch_Files),
  391	386	ITEMacPatch_Files,
  392	387	},
  393	388
  ......	@@ -422,7 +417,6 @@
  422	417	ITE_GameFonts,
  423	418	&MAC_GameSound,
  424	419	&ITEPC_GameSound,
  425		0,
  426	420	NULL,
  427	421	},
  428	422
  ......	@@ -454,7 +448,6 @@
  454	448	ITE_GameFonts,
  455	449	&MAC_GameSound,
  456	450	&ITEPC_GameSound,
  457		0,
  458	451	NULL,
  459	452	},
  460	453
  ......	@@ -481,7 +474,6 @@
  481	474	ITE_GameFonts,
  482	475	&ITEPC_GameSound,
  483	476	&ITEPC_GameSound,
  484		ARRAYSIZE(ITEPatch_Files),
  485	477	ITEPatch_Files,
  486	478	},
  487	479
  ......	@@ -508,7 +500,6 @@
  508	500	ITE_GameFonts,
  509	501	&ITEPC_GameSound,
  510	502	&ITEPC_GameSound,
  511		ARRAYSIZE(ITEPatch_Files),
  512	503	ITEPatch_Files,
  513	504	},
  514	505
  ......	@@ -535,7 +526,6 @@
  535	526	ITE_GameFonts,
  536	527	&ITEPC_GameSound,
  537	528	&ITEPC_GameSound,
  538		ARRAYSIZE(ITEPatch_Files),
  539	529	ITEPatch_Files,
  540	530	},
  541	531
  ......	@@ -563,7 +553,6 @@
  563	553	ITE_GameFonts,
  564	554	&ITEPC_GameSound,
  565	555	&ITEPC_GameSound,
  566		0,
  567	556	NULL,
  568	557	},
  569	558
  ......	@@ -593,7 +582,6 @@
  593	582	ITE_GameFonts,
  594	583	&ITEDISK_GameSound,
  595	584	&ITEDISK_GameSound,
  596		0,
  597	585	NULL,
  598	586	},
  599	587
  ......	@@ -620,7 +608,6 @@
  620	608	ITE_GameFonts,
  621	609	&ITEDISK_GameSound,
  622	610	&ITEDISK_GameSound,
  623		ARRAYSIZE(ITEPatch_Files),
  624	611	ITEPatch_Files,
  625	612	},
  626	613
  ......	@@ -647,7 +634,6 @@
  647	634	ITE_GameFonts,
  648	635	&ITEDISK_GameSound,
  649	636	&ITEDISK_GameSound,
  650		ARRAYSIZE(ITEPatch_Files),
  651	637	ITEPatch_Files,
  652	638	},
  653	639
  ......	@@ -683,7 +669,6 @@
  683	669	IHNMDEMO_GameFonts,
  684	670	&IHNM_GameSound,
  685	671	&IHNM_GameSound,
  686		0,
  687	672	NULL,
  688	673	},
  689	674
  ......	@@ -718,7 +703,6 @@
  718	703	IHNMCD_GameFonts,
  719	704	&IHNM_GameSound,
  720	705	&IHNM_GameSound,
  721		0,
  722	706	NULL,
  723	707	},
  724	708
  ......	@@ -751,7 +735,6 @@
  751	735	IHNMCD_GameFonts,
  752	736	&IHNM_GameSound,
  753	737	&IHNM_GameSound,
  754		0,
  755	738	NULL,
  756	739	},
  757	740
  ......	@@ -782,7 +765,6 @@
  782	765	IHNMCD_GameFonts,
  783	766	&IHNM_GameSound,
  784	767	&IHNM_GameSound,
  785		0,
  786	768	NULL,
  787	769	},
  788	770
  ......	@@ -813,7 +795,6 @@
  813	795	IHNMCD_GameFonts,
  814	796	&IHNM_GameSound,
  815	797	&IHNM_GameSound,
  816		0,
  817	798	NULL,
  818	799	},
  819	800
  ......	@@ -845,7 +826,6 @@
  845	826	IHNMCD_GameFonts,
  846	827	&IHNM_GameSound,
  847	828	&IHNM_GameSound,
  848		0,
  849	829	NULL,
  850	830	},
  851	831
  ......	@@ -876,7 +856,6 @@
  876	856	IHNMCD_GameFonts,
  877	857	&IHNM_GameSound,
  878	858	&IHNM_GameSound,
  879		0,
  880	859	NULL,
  881	860	},
  882	861	// I Have No Mouth And I Must Scream - Mac English CD
  ......	@@ -904,10 +883,9 @@
  904	883	IHNMCD_GameFonts,
  905	884	&MAC_GameSound,
  906	885	&MAC_GameSound,
  907		0,
  908	886	NULL,
  909	887	},
  910		{ AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, 0, NULL }
  	888	{ AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL }
  911	889	};
  912	890
  913	891	} // End of namespace Saga

• /scummvm/trunk/engines/saga/detection.cpp

  ......	@@ -50,7 +50,6 @@
  50	50	const GameFontDescription *fontDescriptions;
  51	51	const GameSoundInfo *voiceInfo;
  52	52	const GameSoundInfo *sfxInfo;
  53		int patchesCount;
  54	53	const GamePatchDescription *patchDescriptions;
  55	54	};
  56	55
  ......	@@ -95,7 +94,6 @@
  95	94	int SagaEngine::getGameNumber() const { return _gameNumber; }
  96	95	int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; }
  97	96
  98		int SagaEngine::getPatchesCount() const { return _gameDescription->patchesCount; }
  99	97	const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; }
  100	98	const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; }
  101	99