diff options
author | Torbjörn Andersson | 2005-06-21 13:55:18 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-06-21 13:55:18 +0000 |
commit | ee28783c746c158550eed88eb20b18025ca79cad (patch) | |
tree | f3ad92616c918d40ef2985809da643b60a38a0a1 | |
parent | 43bc76a29c8628fe9e1ed4a2f345c8ecdad97e61 (diff) | |
download | scummvm-rg350-ee28783c746c158550eed88eb20b18025ca79cad.tar.gz scummvm-rg350-ee28783c746c158550eed88eb20b18025ca79cad.tar.bz2 scummvm-rg350-ee28783c746c158550eed88eb20b18025ca79cad.zip |
Fixed crash when talking to the money changer about the Orb of Storms. The
sound resources were being substituted with animation resources. Now the
substitutions are identified by a resource number *and* a file name.
Could someone verify that ite.rsc is the correct file for all of them?
svn-id: r18422
-rw-r--r-- | saga/rscfile.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp index b35fe9fe6d..b28afb53e2 100644 --- a/saga/rscfile.cpp +++ b/saga/rscfile.cpp @@ -32,15 +32,16 @@ namespace Saga { static struct Substitutes { uint32 id; + const char *resfile; const char *fname; } substitutes[] = { - { 1529, "wyrm.pak" }, - { 1530, "wyrm1.dlt" }, - { 1531, "wyrm2.dlt" }, - { 1532, "wyrm3.dlt" }, - { 1533, "wyrm4.dlt" }, - { 1796, "credit3n.dlt" }, - { 1797, "credit4n.dlt" } + { 1529, "ite.rsc", "wyrm.pak" }, + { 1530, "ite.rsc", "wyrm1.dlt" }, + { 1531, "ite.rsc", "wyrm2.dlt" }, + { 1532, "ite.rsc", "wyrm3.dlt" }, + { 1533, "ite.rsc", "wyrm4.dlt" }, + { 1796, "ite.rsc", "credit3n.dlt" }, + { 1797, "ite.rsc", "credit4n.dlt" } }; @@ -249,11 +250,12 @@ int RSC_LoadResource(RSCFILE_CONTEXT *rsc, uint32 res_num, byte **res_p, size_t } debug(8, "LoadResource %d", res_num); - for (int i = 0; i < ARRAYSIZE(substitutes); i++) - if (substitutes[i].id == res_num) { + for (int i = 0; i < ARRAYSIZE(substitutes); i++) { + if (substitutes[i].id == res_num && strcmp(substitutes[i].resfile, rsc->rc_file_fspec) == 0) { substnum = i; break; } + } if (!(_vm->getFeatures() & GF_WYRMKEEP)) substnum = -1; |