Skip to content

P2: Store multiplayer campaign variables when the campaign moves on #7892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dustinspace217 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

P2: Store multiplayer campaign variables when the campaign moves on #7892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/network/multi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,7 @@ void multi_standalone_postgame_init()
if ( Game_mode & GM_CAMPAIGN_MODE ) {
// MUST store goals and events first - may be used to evaluate next mission
// store goals and events
mission_campaign_store_goals_and_events_and_variables(false);
mission_campaign_store_goals_and_events();

// evaluate next mission
mission_campaign_eval_next_mission();
Expand Down
7 changes: 7 additions & 0 deletions code/network/multi_campaign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@ void multi_campaign_do_debrief(int player_status)
if((Net_player->flags & NETINFO_FLAG_AM_MASTER) && (Campaign.current_mission != -1) && player_status){
// if players want to go to the next mission
if(player_status == 1){
// as in single player: stored when moving on (a chosen loop counts), not on a replay or retry
if((Campaign.next_mission != Campaign.current_mission)
|| (Campaign.loop_enabled && (Campaign.next_mission == Campaign.loop_mission))){
mission_campaign_store_variables(SEXP_VARIABLE_SAVE_ON_MISSION_PROGRESS, false);
mission_campaign_store_containers(ContainerType::SAVE_ON_MISSION_PROGRESS, false);
}

// move the multiplayer campaign along
multi_campaign_next_mission();

Expand Down
Loading