diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp index 7074e27b5f5..114a0eca433 100644 --- a/engines/grim/detection.cpp +++ b/engines/grim/detection.cpp @@ -251,7 +251,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -264,7 +264,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -277,7 +277,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -290,7 +290,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -303,7 +303,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -316,7 +316,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::PT_BRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -329,7 +329,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::RU_RUS, Common::kPlatformWindows, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -342,7 +342,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformPS2, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -355,7 +355,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::DE_DEU, Common::kPlatformPS2, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -368,7 +368,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::IT_ITA, Common::kPlatformPS2, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -381,7 +381,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::ES_ESP, Common::kPlatformPS2, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -394,7 +394,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformPS2, ADGF_NO_FLAGS, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, @@ -407,7 +407,7 @@ static const GrimGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, - GUIO_NONE + GUIO1(GAMEOPTION_LOAD_DATAUSR) }, GType_MONKEY4 }, diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp index a93f9c7ea06..b0dd9c0c8a9 100644 --- a/engines/grim/resource.cpp +++ b/engines/grim/resource.cpp @@ -153,6 +153,14 @@ ResourceLoader::ResourceLoader() { if (g_grim->getGamePlatform() == Common::kPlatformPS2) { SearchMan.listMatchingMembers(files, "???.m4b"); } + + //Check the presence of datausr.m4b and if the user wants to load it. + //In this case put it in the top of the list + const char *datausr_name = "datausr.m4b"; + if (SearchMan.hasFile(datausr_name) && ConfMan.getBool("datausr_load")) { + warning("Loading datausr.m4b. Please note that the ResidualVM-team doesn't provide support for using such patches"); + files.push_front(SearchMan.getMember(datausr_name)); + } } }