Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/menuui/mainhallmenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -975,8 +975,9 @@ void main_hall_do(float frametime)
if (Num_recent_missions > 0) {
strcpy_s(Game_current_mission_filename, Recent_missions[0]);
} else {
if (mission_load_up_campaign()) {
if (mission_load_up_campaign() || Campaign.missions.empty()) {
main_hall_set_notify_string(XSTR( "Campaign file is currently unavailable", 1606));
break;
}
strcpy_s(Game_current_mission_filename, Campaign.missions[0].name);
}
Expand Down
39 changes: 22 additions & 17 deletions code/menuui/readyroom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ static char *Mission_filenames[MAX_MISSIONS] = { NULL };
static char *Standalone_mission_names[MAX_MISSIONS] = { NULL };
static int Standalone_mission_flags[MAX_MISSIONS];
static char *Campaign_missions[MAX_MISSIONS] = { NULL };
static char *Campaign_mission_names[MAX_CAMPAIGN_MISSIONS] = { NULL };
static SCP_vector<char*> Campaign_mission_names;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decidedly not a fan of SCP_vector<char*> over SCP_vector<SCP_string>, especially since quite some code is destroying the allocated strings which degrades to an automatic destruction with a real string

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are converted in PR #7825

static int Campaign_mission_flags[MAX_MISSIONS];
static int Simroom_show_all = 0;
static int Standalone_mission_names_inited = 0;
Expand Down Expand Up @@ -544,7 +544,7 @@ int build_campaign_mission_list_do_frame(bool API_Access)
static int valid_missions_with_info = 0; // we use this to avoid blank entries in the mission list

// When no campaign files in data directory
if (Campaign.num_missions == 0) {
if (Campaign.missions.empty()) {
Campaign_mission_names_inited = 1;
return 1;
}
Expand All @@ -553,6 +553,11 @@ int build_campaign_mission_list_do_frame(bool API_Access)
sprintf(popup_str, XSTR("Campaign Mission\n\n%s", 990), Campaign.missions[Num_campaign_missions_with_info].name);
popup_change_text(popup_str.c_str());

// Ensure storage matches the number of missions we are about to process
if (Campaign_mission_names.size() != Campaign.missions.size()) {
Campaign_mission_names.assign(Campaign.missions.size(), nullptr);
}

// Set global variable so we we'll have list available next time
Campaign_mission_names[Num_campaign_missions_with_info] = NULL;
Campaign_mission_flags[Num_campaign_missions_with_info] = 0;
Expand Down Expand Up @@ -596,7 +601,7 @@ int build_campaign_mission_list_do_frame(bool API_Access)

Num_campaign_missions_with_info++;

if (Num_campaign_missions_with_info == Campaign.num_missions) {
if (Num_campaign_missions_with_info == sz2i(Campaign.missions.size())) {
valid_missions_with_info = 0;
Campaign_mission_names_inited = 1;
return 1;
Expand Down Expand Up @@ -684,10 +689,10 @@ void sim_room_reset_campaign_listing()
return;


for (int i=0; i<Campaign.num_missions; i++) {
if (Campaign_mission_names[i]) {
vm_free(Campaign_mission_names[i]);
Campaign_mission_names[i] = NULL;
for (auto*& name : Campaign_mission_names) {
if (name) {
vm_free(name);
name = nullptr;
}
}

Expand Down Expand Up @@ -1051,7 +1056,7 @@ void sim_room_init()
mission_campaign_next_mission();
} else {
Campaign.filename[0] = 0;
Campaign.num_missions = 0;
Campaign.missions.clear();

// don't display the popup in the sim room - first because there is already logic to prevent listing campaign missions,
// second because there's not much the player can do about it in the sim room, and third because displaying the popup
Expand Down Expand Up @@ -1138,10 +1143,10 @@ void sim_room_close()
}

if (Campaign_mission_names_inited) {
for (i=0; i<Campaign.num_missions; i++) {
if (Campaign_mission_names[i]) {
vm_free(Campaign_mission_names[i]);
Campaign_mission_names[i] = NULL;
for (auto*& name : Campaign_mission_names) {
if (name) {
vm_free(name);
name = nullptr;
}
}
}
Expand Down Expand Up @@ -1216,10 +1221,10 @@ void api_sim_room_build_mission_list(bool API_Access)
}

if (Campaign_mission_names_inited) {
for (i = 0; i < Campaign.num_missions; i++) {
if (Campaign_mission_names[i]) {
vm_free(Campaign_mission_names[i]);
Campaign_mission_names[i] = NULL;
for (auto*& name : Campaign_mission_names) {
if (name) {
vm_free(name);
name = nullptr;
}
}
}
Expand Down Expand Up @@ -1680,7 +1685,7 @@ bool campaign_build_campaign_list() {
mission_campaign_next_mission();
} else {
Campaign.filename[0] = 0;
Campaign.num_missions = 0;
Campaign.missions.clear();

mission_campaign_load_failure_popup();
}
Expand Down
Loading
Loading