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
2 changes: 0 additions & 2 deletions code/ai/ai.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion code/ai/aicode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
2 changes: 1 addition & 1 deletion code/iff_defs/iff_defs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions code/mission/missionparse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/missioneditor/missionsave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 4 additions & 3 deletions fred2/missionnotesdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 0 additions & 12 deletions qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -508,15 +505,6 @@ SCP_vector<std::pair<SCP_string, SCP_string>> 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);
}
Expand Down
3 changes: 0 additions & 3 deletions qtfred/src/mission/dialogs/MissionSpecDialogModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -161,8 +160,6 @@ class MissionSpecDialogModel : public AbstractDialogModel {
const SCP_vector<std::pair<SCP_string, bool>>& getMissionFlagsList();
static SCP_vector<std::pair<SCP_string, SCP_string>> getMissionFlagDescriptions();

void setMissionFullWar(bool enabled);

void setAIProfileIndex(int m_ai_profile);
int getAIProfileIndex() const;

Expand Down
Loading