Skip to content

Commit a0fcf28

Browse files
committed
do not save non-player-allowed weapons
1 parent 8521398 commit a0fcf28

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

code/missioneditor/missionsave.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4404,6 +4404,9 @@ int Fred_mission_save::save_players()
44044404
fout(" (\n");
44054405
if (i == 0) {
44064406
for (j = 0; j < weapon_info_size(); j++) {
4407+
if (!Weapon_info[j].wi_flags[Weapon::Info_Flags::Player_allowed]) {
4408+
continue;
4409+
}
44074410
if (The_mission.support_ships.rearm_weapon_pool[j] != 0) {
44084411
fout("\t\"%s\"\t%d\n", Weapon_info[j].name, The_mission.support_ships.rearm_weapon_pool[j]);
44094412
}

fred2/supportrearmdlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void CSupportRearmDlg::OnOK()
357357
memcpy(The_mission.support_ships.rearm_weapon_pool, m_rearm_weapon_pool, sizeof(m_rearm_weapon_pool));
358358

359359
for (int i = 0; i < weapon_info_size(); ++i) {
360-
if (Weapon_info[i].disallow_rearm) {
360+
if (Weapon_info[i].disallow_rearm || !Weapon_info[i].wi_flags[Weapon::Info_Flags::Player_allowed]) {
361361
The_mission.support_ships.rearm_weapon_pool[i] = 0;
362362
}
363363
}

qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ bool MissionSpecDialogModel::apply() {
140140
The_mission.support_ships.rearm_pool_from_loadout = _m_support_rearm_settings.rearmPoolFromLoadout;
141141
for (int i = 0; i < MAX_WEAPON_TYPES; ++i) {
142142
The_mission.support_ships.rearm_weapon_pool[i] = _m_support_rearm_settings.rearmWeaponPool[i];
143+
if (Weapon_info[i].disallow_rearm || !Weapon_info[i].wi_flags[Weapon::Info_Flags::Player_allowed]) {
144+
The_mission.support_ships.rearm_weapon_pool[i] = 0;
145+
}
143146
}
144147

145148
// Copy mission flags

0 commit comments

Comments
 (0)