libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-24 18:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA: Removed patchesCount from SAGAGameDescription

Browse Source 
svn-id: r34693
This commit is contained in:
Max Horn 2008-09-30 09:08:17 +00:00
parent 66c481c70a
commit 82f7b3e6e4
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/saga/detection.cpp
View File

@ -50,7 +50,6 @@ struct SAGAGameDescription {
const GameFontDescription *fontDescriptions; const GameFontDescription *fontDescriptions;
const GameSoundInfo *voiceInfo; const GameSoundInfo *voiceInfo;
const GameSoundInfo *sfxInfo; const GameSoundInfo *sfxInfo;
int patchesCount;
const GamePatchDescription *patchDescriptions; const GamePatchDescription *patchDescriptions;
}; };
@ -95,7 +94,6 @@ Common::Platform SagaEngine::getPlatform() const { return _gameDescription->desc
int SagaEngine::getGameNumber() const { return _gameNumber; } int SagaEngine::getGameNumber() const { return _gameNumber; }
int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; } int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; }
int SagaEngine::getPatchesCount() const { return _gameDescription->patchesCount; }
const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; } const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; }
const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; } const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; }

32
engines/saga/detection_tables.h
View File

@ -160,7 +160,8 @@ static const GamePatchDescription ITEPatch_Files[] = {
{ "credit4n.dlt", GAME_RESOURCEFILE, 1797, NULL}, // PC { "credit4n.dlt", GAME_RESOURCEFILE, 1797, NULL}, // PC
{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, // Macintosh { "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, // Macintosh
{ "p2_a.voc", GAME_VOICEFILE, 4, NULL}, { "p2_a.voc", GAME_VOICEFILE, 4, NULL},
{ "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound} { "p2_a.iaf", GAME_VOICEFILE, 4, &ITEPC_GameSound},
{ NULL, 0, 0, NULL}
}; };
static const GamePatchDescription ITEMacPatch_Files[] = { static const GamePatchDescription ITEMacPatch_Files[] = {
@ -171,7 +172,8 @@ static const GamePatchDescription ITEMacPatch_Files[] = {
{ "wyrm4.dlt", GAME_RESOURCEFILE, 1533, NULL}, { "wyrm4.dlt", GAME_RESOURCEFILE, 1533, NULL},
{ "credit3m.dlt", GAME_RESOURCEFILE, 1796, NULL}, { "credit3m.dlt", GAME_RESOURCEFILE, 1796, NULL},
{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, { "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL},
{ "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound} { "p2_a.iaf", GAME_VOICEFILE, 4, &MAC_GameSound},
{ NULL, 0, 0, NULL}
}; };
static const SAGAGameDescription gameDescriptions[] = { static const SAGAGameDescription gameDescriptions[] = {
@ -209,7 +211,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEDEMO_GameFonts, ITEDEMO_GameFonts,
&ITEDISK_GameSound, &ITEDISK_GameSound,
&ITEDISK_GameSound, &ITEDISK_GameSound,
0,
NULL, NULL,
}, },
@ -237,7 +238,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice, &ITEDEMO_GameVoice,
&MAC_GameSound, &MAC_GameSound,
ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files, ITEMacPatch_Files,
}, },
@ -266,7 +266,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice, &ITEDEMO_GameVoice,
&MAC_GameSound, &MAC_GameSound,
ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files, ITEMacPatch_Files,
}, },
@ -295,7 +294,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice, &ITEDEMO_GameVoice,
&ITEPC_GameSound, &ITEPC_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -324,7 +322,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&ITEWINDEMO1_GameSound, &ITEWINDEMO1_GameSound,
&ITEWINDEMO1_GameSound, &ITEWINDEMO1_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -360,7 +357,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&ITEMACCD_G_GameSound, &ITEMACCD_G_GameSound,
&ITEMACCD_G_GameSound, &ITEMACCD_G_GameSound,
0,
NULL, NULL,
}, },
@ -387,7 +383,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEWINDEMO_GameFonts, ITEWINDEMO_GameFonts,
&MAC_GameSound, &MAC_GameSound,
&MAC_GameSound, &MAC_GameSound,
ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files, ITEMacPatch_Files,
}, },
@ -422,7 +417,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&MAC_GameSound, &MAC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
0,
NULL, NULL,
}, },
@ -454,7 +448,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&MAC_GameSound, &MAC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
0,
NULL, NULL,
}, },
@ -481,7 +474,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEPC_GameSound, &ITEPC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -508,7 +500,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEPC_GameSound, &ITEPC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -535,7 +526,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEPC_GameSound, &ITEPC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -563,7 +553,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEPC_GameSound, &ITEPC_GameSound,
&ITEPC_GameSound, &ITEPC_GameSound,
0,
NULL, NULL,
}, },
@ -593,7 +582,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEDISK_GameSound, &ITEDISK_GameSound,
&ITEDISK_GameSound, &ITEDISK_GameSound,
0,
NULL, NULL,
}, },
@ -620,7 +608,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEDISK_GameSound, &ITEDISK_GameSound,
&ITEDISK_GameSound, &ITEDISK_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -647,7 +634,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts, ITE_GameFonts,
&ITEDISK_GameSound, &ITEDISK_GameSound,
&ITEDISK_GameSound, &ITEDISK_GameSound,
ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files, ITEPatch_Files,
}, },
@ -683,7 +669,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMDEMO_GameFonts, IHNMDEMO_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -718,7 +703,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -751,7 +735,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -782,7 +765,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -813,7 +795,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -845,7 +826,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
@ -876,7 +856,6 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&IHNM_GameSound, &IHNM_GameSound,
&IHNM_GameSound, &IHNM_GameSound,
0,
NULL, NULL,
}, },
// I Have No Mouth And I Must Scream - Mac English CD // I Have No Mouth And I Must Scream - Mac English CD
@ -904,10 +883,9 @@ static const SAGAGameDescription gameDescriptions[] = {
IHNMCD_GameFonts, IHNMCD_GameFonts,
&MAC_GameSound, &MAC_GameSound,
&MAC_GameSound, &MAC_GameSound,
0,
NULL, NULL,
}, },
{ AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, 0, NULL } { AD_TABLE_END_MARKER, 0, 0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL }
}; };
} // End of namespace Saga } // End of namespace Saga

4
engines/saga/rscfile.cpp
View File

@ -263,7 +263,6 @@ bool Resource::loadMacContext(ResourceContext *context) {
bool Resource::loadContext(ResourceContext *context) { bool Resource::loadContext(ResourceContext *context) {
size_t i; size_t i;
int j;
const GamePatchDescription *patchDescription; const GamePatchDescription *patchDescription;
ResourceData *resourceData; ResourceData *resourceData;
uint16 subjectResourceType; uint16 subjectResourceType;
@ -320,8 +319,7 @@ bool Resource::loadContext(ResourceContext *context) {
} }
//process external patch files //process external patch files
for (j = 0; j < _vm->getPatchesCount(); j++) { for (patchDescription = _vm->getPatchDescriptions(); patchDescription->fileName; ++patchDescription) {
patchDescription = &_vm->getPatchDescriptions()[j];
if ((patchDescription->fileType & context->fileType) != 0) { if ((patchDescription->fileType & context->fileType) != 0) {
if (patchDescription->resourceId < context->count) { if (patchDescription->resourceId < context->count) {
resourceData = &context->table[patchDescription->resourceId]; resourceData = &context->table[patchDescription->resourceId];