[Scummvm-cvs-logs] SF.net SVN: scummvm:[34693] scummvm/trunk/engines/saga
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Sep 30 11:08:21 CEST 2008
Revision: 34693
http://scummvm.svn.sourceforge.net/scummvm/?rev=34693&view=rev
Author: fingolfin
Date: 2008-09-30 09:08:17 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
SAGA: Removed patchesCount from SAGAGameDescription
Modified Paths:
--------------
scummvm/trunk/engines/saga/detection.cpp
scummvm/trunk/engines/saga/detection_tables.h
scummvm/trunk/engines/saga/rscfile.cpp
Modified: scummvm/trunk/engines/saga/detection.cpp
===================================================================
--- scummvm/trunk/engines/saga/detection.cpp 2008-09-30 09:07:03 UTC (rev 34692)
+++ scummvm/trunk/engines/saga/detection.cpp 2008-09-30 09:08:17 UTC (rev 34693)
@@ -50,7 +50,6 @@
const GameFontDescription *fontDescriptions;
const GameSoundInfo *voiceInfo;
const GameSoundInfo *sfxInfo;
- int patchesCount;
const GamePatchDescription *patchDescriptions;
};
@@ -95,7 +94,6 @@
int SagaEngine::getGameNumber() const { return _gameNumber; }
int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; }
-int SagaEngine::getPatchesCount() const { return _gameDescription->patchesCount; }
const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; }
const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; }
Modified: scummvm/trunk/engines/saga/detection_tables.h
===================================================================
--- scummvm/trunk/engines/saga/detection_tables.h 2008-09-30 09:07:03 UTC (rev 34692)
+++ scummvm/trunk/engines/saga/detection_tables.h 2008-09-30 09:08:17 UTC (rev 34693)
@@ -160,7 +160,8 @@
{ "credit4n.dlt", GAME_RESOURCEFILE, 1797, NULL}, // PC
{ "credit4m.dlt", GAME_RESOURCEFILE, 1797, NULL}, // Macintosh
{ "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[] = {
@@ -171,7 +172,8 @@
{ "wyrm4.dlt", GAME_RESOURCEFILE, 1533, NULL},
{ "credit3m.dlt", GAME_RESOURCEFILE, 1796, 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[] = {
@@ -209,7 +211,6 @@
ITEDEMO_GameFonts,
&ITEDISK_GameSound,
&ITEDISK_GameSound,
- 0,
NULL,
},
@@ -237,7 +238,6 @@
ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice,
&MAC_GameSound,
- ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files,
},
@@ -266,7 +266,6 @@
ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice,
&MAC_GameSound,
- ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files,
},
@@ -295,7 +294,6 @@
ITEWINDEMO_GameFonts,
&ITEDEMO_GameVoice,
&ITEPC_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -324,7 +322,6 @@
ITEWINDEMO_GameFonts,
&ITEWINDEMO1_GameSound,
&ITEWINDEMO1_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -360,7 +357,6 @@
ITEWINDEMO_GameFonts,
&ITEMACCD_G_GameSound,
&ITEMACCD_G_GameSound,
- 0,
NULL,
},
@@ -387,7 +383,6 @@
ITEWINDEMO_GameFonts,
&MAC_GameSound,
&MAC_GameSound,
- ARRAYSIZE(ITEMacPatch_Files),
ITEMacPatch_Files,
},
@@ -422,7 +417,6 @@
ITE_GameFonts,
&MAC_GameSound,
&ITEPC_GameSound,
- 0,
NULL,
},
@@ -454,7 +448,6 @@
ITE_GameFonts,
&MAC_GameSound,
&ITEPC_GameSound,
- 0,
NULL,
},
@@ -481,7 +474,6 @@
ITE_GameFonts,
&ITEPC_GameSound,
&ITEPC_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -508,7 +500,6 @@
ITE_GameFonts,
&ITEPC_GameSound,
&ITEPC_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -535,7 +526,6 @@
ITE_GameFonts,
&ITEPC_GameSound,
&ITEPC_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -563,7 +553,6 @@
ITE_GameFonts,
&ITEPC_GameSound,
&ITEPC_GameSound,
- 0,
NULL,
},
@@ -593,7 +582,6 @@
ITE_GameFonts,
&ITEDISK_GameSound,
&ITEDISK_GameSound,
- 0,
NULL,
},
@@ -620,7 +608,6 @@
ITE_GameFonts,
&ITEDISK_GameSound,
&ITEDISK_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -647,7 +634,6 @@
ITE_GameFonts,
&ITEDISK_GameSound,
&ITEDISK_GameSound,
- ARRAYSIZE(ITEPatch_Files),
ITEPatch_Files,
},
@@ -683,7 +669,6 @@
IHNMDEMO_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -718,7 +703,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -751,7 +735,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -782,7 +765,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -813,7 +795,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -845,7 +826,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
@@ -876,7 +856,6 @@
IHNMCD_GameFonts,
&IHNM_GameSound,
&IHNM_GameSound,
- 0,
NULL,
},
// I Have No Mouth And I Must Scream - Mac English CD
@@ -904,10 +883,9 @@
IHNMCD_GameFonts,
&MAC_GameSound,
&MAC_GameSound,
- 0,
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
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2008-09-30 09:07:03 UTC (rev 34692)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2008-09-30 09:08:17 UTC (rev 34693)
@@ -263,7 +263,6 @@
bool Resource::loadContext(ResourceContext *context) {
size_t i;
- int j;
const GamePatchDescription *patchDescription;
ResourceData *resourceData;
uint16 subjectResourceType;
@@ -320,8 +319,7 @@
}
//process external patch files
- for (j = 0; j < _vm->getPatchesCount(); j++) {
- patchDescription = &_vm->getPatchDescriptions()[j];
+ for (patchDescription = _vm->getPatchDescriptions(); patchDescription->fileName; ++patchDescription) {
if ((patchDescription->fileType & context->fileType) != 0) {
if (patchDescription->resourceId < context->count) {
resourceData = &context->table[patchDescription->resourceId];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list