From 212b8bfa105f1fd5c807a795372f2f729873b220 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sat, 2 Jan 2016 17:57:02 +0000 Subject: [PATCH] translate scenarios by raw normalised name --- src/scenario.c | 9 ++++----- src/scenario_list.c | 7 +------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/scenario.c b/src/scenario.c index 3c52ad321f..7dd400aa0c 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -268,13 +268,12 @@ void scenario_begin() safe_strncpy((char*)RCT2_ADDRESS_SCENARIO_NAME, s6Info->name, 64); { - // Get filename - utf8 filename[MAX_PATH]; - safe_strncpy(filename, _scenarioFileName, sizeof(filename)); - path_remove_extension(filename); + utf8 normalisedName[64]; + safe_strncpy(normalisedName, s6Info->name, sizeof(normalisedName)); + scenario_normalise_name(normalisedName); rct_string_id localisedStringIds[3]; - if (language_get_localised_scenario_strings(filename, localisedStringIds)) { + if (language_get_localised_scenario_strings(normalisedName, localisedStringIds)) { if (localisedStringIds[0] != (rct_string_id)STR_NONE) { safe_strncpy((char*)RCT2_ADDRESS_SCENARIO_NAME, language_get_string(localisedStringIds[0]), 32); } diff --git a/src/scenario_list.c b/src/scenario_list.c index 3604a3d806..1a403da647 100644 --- a/src/scenario_list.c +++ b/src/scenario_list.c @@ -71,7 +71,6 @@ void scenario_load_list() scenario_list_sort(); scenario_scores_load(); - utf8 scoresPath[MAX_PATH]; scenario_scores_legacy_get_path(scoresPath); scenario_scores_legacy_load(scoresPath); @@ -189,12 +188,8 @@ static void scenario_list_add(const utf8 *path, uint64 timestamp) static void scenario_translate(scenario_index_entry *scenarioEntry, const rct_object_entry *stexObjectEntry) { - utf8 filenameWithoutExtension[MAX_PATH]; - safe_strncpy(filenameWithoutExtension, scenarioEntry->path, sizeof(filenameWithoutExtension)); - path_remove_extension(filenameWithoutExtension); - rct_string_id localisedStringIds[3]; - if (language_get_localised_scenario_strings(filenameWithoutExtension, localisedStringIds)) { + if (language_get_localised_scenario_strings(scenarioEntry->name, localisedStringIds)) { if (localisedStringIds[0] != (rct_string_id)STR_NONE) { safe_strncpy(scenarioEntry->name, language_get_string(localisedStringIds[0]), 64); }