From 7fbcc3598d0051073d9f90ab5a16920bb8450597 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sun, 22 Feb 2015 18:24:19 +0000 Subject: [PATCH] ensure scenario path is set when loading a saved game --- src/game.c | 2 ++ src/scenario.c | 6 ++++++ src/scenario.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/game.c b/src/game.c index e6ee7a00aa..d6fde1797d 100644 --- a/src/game.c +++ b/src/game.c @@ -694,6 +694,8 @@ int game_load_save(const char *path) load_palette(); gfx_invalidate_screen(); + + scenario_set_filename((char*)0x0135936C); return 1; } diff --git a/src/scenario.c b/src/scenario.c index 0174f17119..663426b104 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -358,6 +358,12 @@ void scenario_end() window_park_objective_open(); } +void scenario_set_filename(const char *value) +{ + subsitute_path(_scenarioPath, RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), value); + _scenarioFileName = path_get_filename(_scenarioPath); +} + /** * * rct2: 0x0066A752 diff --git a/src/scenario.h b/src/scenario.h index 1e07ac6372..f6e710c6a6 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -407,6 +407,7 @@ void scenario_update(); unsigned int scenario_rand(); int scenario_prepare_for_save(); int scenario_save(char *path, int flags); +void scenario_set_filename(const char *value); void scenario_failure(); void scenario_success(); void scenario_success_submit_name(const char *name);