Fix some bugs with the mission selection

Keriew · Apr 24, 2024 · a35dd15 · a35dd15
1 parent 4920e41
commit a35dd15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/window/mission_end.c b/src/window/mission_end.c
@@ -306,14 +306,14 @@ static void advance_to_next_mission(void)
         int personal_savings = calc_bound(city_emperor_personal_savings(), 0, mission_info->max_personal_savings);
         setting_set_personal_savings_for_mission(0, personal_savings);
         window_mission_selection_show();
-    } else if (scenario_campaign_rank() >= 11 || scenario_is_custom()) {
+    } else if (scenario_campaign_rank() >= 10 || scenario_is_custom()) {
         window_main_menu_show(1);
         setting_clear_personal_savings();
         scenario_settings_init();
         scenario_set_campaign_rank(2);
     } else {
-        setting_set_personal_savings_for_mission(scenario_campaign_rank() + 1, city_emperor_personal_savings());
         scenario_set_campaign_rank(scenario_campaign_rank() + 1);
+        setting_set_personal_savings_for_mission(scenario_campaign_rank(), city_emperor_personal_savings());
         scenario_set_campaign_mission(game_mission_peaceful());
         window_mission_selection_show();
     }

diff --git a/src/window/mission_selection.c b/src/window/mission_selection.c
@@ -88,15 +88,15 @@ static void load_original_campaign_rank_scenarios(int rank)
     DEFAULT_SCENARIOS[0].name = lang_get_string(144, 1 + 3 * rank + 1);
     DEFAULT_SCENARIOS[0].description = 0;
     DEFAULT_SCENARIOS[0].fanfare = "wavs/fanfare_nu1.wav";
-    DEFAULT_SCENARIOS[0].x = CAMPAIGN_SELECTION[rank].x_peaceful;
-    DEFAULT_SCENARIOS[0].y = CAMPAIGN_SELECTION[rank].y_peaceful;
+    DEFAULT_SCENARIOS[0].x = CAMPAIGN_SELECTION[rank - 2].x_peaceful;
+    DEFAULT_SCENARIOS[0].y = CAMPAIGN_SELECTION[rank - 2].y_peaceful;
 
     DEFAULT_SCENARIOS[1].id = game_mission_military();
     DEFAULT_SCENARIOS[1].name = lang_get_string(144, 1 + 3 * rank + 2);
     DEFAULT_SCENARIOS[1].description = 0;
     DEFAULT_SCENARIOS[1].fanfare = "wavs/fanfare_nu5.wav";
-    DEFAULT_SCENARIOS[1].x = CAMPAIGN_SELECTION[rank].x_military;
-    DEFAULT_SCENARIOS[1].y = CAMPAIGN_SELECTION[rank].y_military;
+    DEFAULT_SCENARIOS[1].x = CAMPAIGN_SELECTION[rank - 2].x_military;
+    DEFAULT_SCENARIOS[1].y = CAMPAIGN_SELECTION[rank - 2].y_military;
 
     data.mission.scenarios[0] = &DEFAULT_SCENARIOS[0];
     data.mission.scenarios[1] = &DEFAULT_SCENARIOS[1];