diff --git a/code/ai/ai.h b/code/ai/ai.h index aa18cfc881c..8dc9bcc5605 100644 --- a/code/ai/ai.h +++ b/code/ai/ai.h @@ -490,8 +490,6 @@ typedef struct { #define MAX_BURST_DAMAGE 20.0f // max damage that can be done in BURST_DURATION #define BURST_DURATION 500 // decay time over which Player->damage_this_burst falls from MAX_BURST_DAMAGE to 0 -extern int Mission_all_attack; // !0 means all teams attack all teams. - extern ai_info Ai_info[]; extern ai_info *Player_ai; diff --git a/code/ai/aicode.cpp b/code/ai/aicode.cpp index 047f677dd16..b9be4d6b3ae 100644 --- a/code/ai/aicode.cpp +++ b/code/ai/aicode.cpp @@ -209,7 +209,6 @@ int Num_ai_classes; int AI_FrameCount = 0; int AI_watch_object = 0; // Debugging, object to spew debug info for. -int Mission_all_attack = 0; // !0 means all teams attack all teams. // Constant for flag, Name of flag ai_flag_name Ai_flag_names[] = { diff --git a/code/iff_defs/iff_defs.cpp b/code/iff_defs/iff_defs.cpp index 9732c7efaf9..f07177cd431 100644 --- a/code/iff_defs/iff_defs.cpp +++ b/code/iff_defs/iff_defs.cpp @@ -689,7 +689,7 @@ int iff_get_attackee_mask(int attacker_team) return 0; // All teams attack all other teams. - if (Mission_all_attack) + if (The_mission.flags[Mission::Mission_Flags::All_attack]) { return Iff_info[attacker_team].attackee_bitmask_all_teams_at_war; } diff --git a/code/mission/missionparse.cpp b/code/mission/missionparse.cpp index b03fe1ce6b3..7b0d584ecbb 100644 --- a/code/mission/missionparse.cpp +++ b/code/mission/missionparse.cpp @@ -1106,7 +1106,7 @@ void parse_mission_info(mission *pm, bool basic = false) } if (optional_string("+All Teams Attack")){ - Mission_all_attack = 1; + pm->flags.set(Mission::Mission_Flags::All_attack); } // Maybe delay the player's entry. @@ -7320,7 +7320,6 @@ void mission_init(mission *pm, bool quick_init) *Player_start_shipname = 0; // make the string 0 length for checking later Entry_delay_time = 0; - Mission_all_attack = 0; Num_teams = 1; // assume 1 // sometimes we don't need to run through the entire initialization, diff --git a/code/missioneditor/missionsave.cpp b/code/missioneditor/missionsave.cpp index 6f57eba347f..40fc1602381 100644 --- a/code/missioneditor/missionsave.cpp +++ b/code/missioneditor/missionsave.cpp @@ -2912,7 +2912,7 @@ int Fred_mission_save::save_mission_info() } } - if (Mission_all_attack) { + if (The_mission.flags[Mission::Mission_Flags::All_attack]) { if (optional_string_fred("+All Teams Attack")) { parse_comments(); } else { diff --git a/fred2/missionnotesdlg.cpp b/fred2/missionnotesdlg.cpp index 3a73f896b05..1efe6943a02 100644 --- a/fred2/missionnotesdlg.cpp +++ b/fred2/missionnotesdlg.cpp @@ -174,7 +174,7 @@ int CMissionNotesDlg::query_modified() if (Current_soundtrack_num != m_event_music - 1){ return 1; } - if (Mission_all_attack != m_full_war){ + if (The_mission.flags[Mission::Mission_Flags::All_attack] != (m_full_war != 0)){ return 1; } @@ -233,6 +233,8 @@ void CMissionNotesDlg::OnOK() // set flags for scramble The_mission.flags.set(Mission::Mission_Flags::Scramble, m_scramble != 0); + The_mission.flags.set(Mission::Mission_Flags::All_attack, m_full_war != 0); + // set the flags for no promotion The_mission.flags.set(Mission::Mission_Flags::No_promotion, m_no_promotion != 0); @@ -333,7 +335,6 @@ void CMissionNotesDlg::OnOK() else strcpy_s(The_mission.command_sender, m_command_sender); - MODIFY(Mission_all_attack, m_full_war); if (query_modified()){ set_modified(); } @@ -384,7 +385,7 @@ BOOL CMissionNotesDlg::OnInitDialog() convert_multiline_string(m_mission_desc, The_mission.mission_desc); m_red_alert = (The_mission.flags[Mission::Mission_Flags::Red_alert]) ? 1 : 0; m_scramble = (The_mission.flags[Mission::Mission_Flags::Scramble]) ? 1 : 0; - m_full_war = Mission_all_attack; + m_full_war = (The_mission.flags[Mission::Mission_Flags::All_attack]) ? 1 : 0; m_no_promotion = (The_mission.flags[Mission::Mission_Flags::No_promotion]) ? 1 : 0; m_no_builtin_msgs = (The_mission.flags[Mission::Mission_Flags::No_builtin_msgs]) ? 1 : 0; m_no_builtin_command_msgs = (The_mission.flags[Mission::Mission_Flags::No_builtin_command]) ? 1 : 0; diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp index 132eac7c28a..50616abb56d 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp @@ -36,7 +36,6 @@ void MissionSpecDialogModel::initializeData() { _m_mission_notes = The_mission.notes; _m_mission_desc = The_mission.mission_desc; - _m_full_war = Mission_all_attack; _m_disallow_support = (The_mission.support_ships.max_support_ships == 0); _m_flags = The_mission.flags; @@ -192,8 +191,6 @@ bool MissionSpecDialogModel::apply() { else strcpy_s(The_mission.command_sender, _m_command_sender.c_str()); - Mission_all_attack = (int)_m_full_war; - // update the Num_teams variable accoriding to mission types Num_teams = 1; if ((The_mission.game_type & MISSION_TYPE_MULTI) && (The_mission.game_type & MISSION_TYPE_MULTI_TEAMS)) { @@ -508,15 +505,6 @@ SCP_vector> MissionSpecDialogModel::getMission return descriptions; } -void MissionSpecDialogModel::setMissionFullWar(bool enabled) { - if (_m_full_war != enabled) { - _m_full_war = enabled; - _m_flags.set(Mission::Mission_Flags::All_attack, enabled); - set_modified(); - modelChanged(); - } -} - void MissionSpecDialogModel::setAIProfileIndex(int m_ai_profile) { modify(_m_ai_profile, m_ai_profile); } diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.h b/qtfred/src/mission/dialogs/MissionSpecDialogModel.h index 5e76d03720f..50f184c37d0 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.h +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.h @@ -64,7 +64,6 @@ class MissionSpecDialogModel : public AbstractDialogModel { SCP_string _m_substitute_event_music; int _m_command_persona; SCP_string _m_command_sender; - bool _m_full_war; uint _m_num_respawns; int _m_max_respawn_delay; float _m_player_entry_delay; @@ -161,8 +160,6 @@ class MissionSpecDialogModel : public AbstractDialogModel { const SCP_vector>& getMissionFlagsList(); static SCP_vector> getMissionFlagDescriptions(); - void setMissionFullWar(bool enabled); - void setAIProfileIndex(int m_ai_profile); int getAIProfileIndex() const;