From 4aa127f17f384548165b1aa731390a2d0993f850 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:26:54 -0800 Subject: [PATCH 01/11] Mission save: write gravity and the hide-in-mission-log flag The mission parser reads $Gravity Acceleration and the hide-in-mission-log ship flag, but the save code never wrote them, so FRED and qtFRED both dropped them the first time a mission was saved. They are now written the same way as their neighbours: gravity after the sound environment, and the flag in the +Flags2 list. --- code/missioneditor/missionsave.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/missioneditor/missionsave.cpp b/code/missioneditor/missionsave.cpp index 6f57eba347f..5caba582d08 100644 --- a/code/missioneditor/missionsave.cpp +++ b/code/missioneditor/missionsave.cpp @@ -3152,6 +3152,19 @@ int Fred_mission_save::save_mission_info() fso_comment_pop(); } + if (The_mission.gravity.xyz.y != 0.0f) { + fso_comment_push(";;FSO 23.0.0;;"); + if (optional_string_fred("$Gravity Acceleration:")) { + parse_comments(2); + fout(" %f", -The_mission.gravity.xyz.y); + } else { + fout_version("\n\n$Gravity Acceleration: %f", -The_mission.gravity.xyz.y); + } + fso_comment_pop(); + } else { + bypass_comment(";;FSO 23.0.0;; $Gravity Acceleration:"); + } + return err; } @@ -3935,6 +3948,8 @@ int Fred_mission_save::save_objects() fout(" \"no_collide\""); if (shipp->flags[Ship::Ship_Flags::No_disabled_self_destruct]) fout(" \"no-disabled-self-destruct\""); + if (shipp->flags[Ship::Ship_Flags::Hide_mission_log]) + fout(" \"hide-in-mission-log\""); if (shipp->flags[Ship::Ship_Flags::Same_arrival_warp_when_docked]) fout(" \"same-arrival-warp-when-docked\""); if (shipp->flags[Ship::Ship_Flags::Same_departure_warp_when_docked]) From b8928fe4acfd3fcbaa3c27f2ed478bd12ea5df26 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:00:12 -0800 Subject: [PATCH 02/11] qtFRED events editor: keep a negative repeat count and the first message's persona and team Opening the events editor and pressing OK without touching anything changed three things. An event with a repeat count of -1 (repeat forever) was reset to 1, because the editor treated every count below 1 as unset; only 0 means unset, as in FRED and in the mission parser. The first message lost its persona and its team, because filling each of those lists selected its first entry and that was stored on the message. Cancelling the untouched editor also asked whether to keep changes, because filling the message fields from the mission ran their edit handlers. Those no longer run while the fields are being filled. --- qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp | 2 +- qtfred/src/ui/dialogs/MissionEventsDialog.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp b/qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp index 676c3c91d4a..c89cc8c287c 100644 --- a/qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp @@ -129,7 +129,7 @@ void MissionEventsDialogModel::initializeEvents() // we must check for the case of the repeat count being 0. This would happen if the repeat // count is not specified in a mission - if (m_events[i].repeat_count <= 0) { + if (m_events[i].repeat_count == 0) { m_events[i].repeat_count = 1; } } diff --git a/qtfred/src/ui/dialogs/MissionEventsDialog.cpp b/qtfred/src/ui/dialogs/MissionEventsDialog.cpp index 267ad74b739..2725cc79ee7 100644 --- a/qtfred/src/ui/dialogs/MissionEventsDialog.cpp +++ b/qtfred/src/ui/dialogs/MissionEventsDialog.cpp @@ -522,6 +522,8 @@ void MissionEventsDialog::initWaveFilenames() { void MissionEventsDialog::initPersonas() { auto list = _model->getPersonaList(); + // filling the list selects its first entry, which must not be stored as the current message's persona + QSignalBlocker blocker(ui->personaCombo); ui->personaCombo->clear(); for (auto&& [name, id] : _model->getPersonaList()) { @@ -532,6 +534,8 @@ void MissionEventsDialog::initPersonas() { void MissionEventsDialog::initMessageTeams() { auto list = _model->getTeamList(); + // as with the personas: filling the list must not store its first entry as the current message's team + QSignalBlocker blocker(ui->messageTeamCombo); ui->messageTeamCombo->clear(); for (const auto& team : list) { @@ -553,6 +557,9 @@ void MissionEventsDialog::initEventTeams() void MissionEventsDialog::updateMessageUi() { + // filling the fields from the model is not an edit, so the edit handlers must not run + util::SignalBlockers blockers(this); + bool enable = true; if (!_model->messageIsValid()) { From 93e7767614bd67be39b2046f199642e0f39c76a8 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:00:12 -0800 Subject: [PATCH 03/11] qtFRED mission specs: make All Teams at War reach the saved mission Ticking All Teams at War in the flag list only set a mission flag that nothing reads. The game and the save code use Mission_all_attack, which the dialog wrote back unchanged, so the saved mission had no +All Teams Attack line and the teams were not at war. The checkbox now starts from Mission_all_attack and is written back to it. The flag itself is no longer stored, so the mission is saved the way FRED saves it: the +All Teams Attack line and no flag bit. --- qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp | 10 ++++++---- qtfred/src/mission/dialogs/MissionSpecDialogModel.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp index 132eac7c28a..2afb307b706 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp @@ -36,10 +36,11 @@ 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; + // the game and the save code read Mission_all_attack, not this flag, so the checkbox has to follow it + _m_flags.set(Mission::Mission_Flags::All_attack, Mission_all_attack != 0); _m_loading_640 = The_mission.loading_screen[GR_640]; _m_loading_1024 = The_mission.loading_screen[GR_1024]; @@ -146,6 +147,8 @@ bool MissionSpecDialogModel::apply() { // Copy mission flags The_mission.flags = _m_flags; + // all-attack is saved as its own line, as FRED does; the flag bit itself stays out of the file + The_mission.flags.remove(Mission::Mission_Flags::All_attack); // set ship trail threshold if (_m_contrail_threshold_flag) { @@ -192,7 +195,7 @@ bool MissionSpecDialogModel::apply() { else strcpy_s(The_mission.command_sender, _m_command_sender.c_str()); - Mission_all_attack = (int)_m_full_war; + Mission_all_attack = _m_flags[Mission::Mission_Flags::All_attack] ? 1 : 0; // update the Num_teams variable accoriding to mission types Num_teams = 1; @@ -509,8 +512,7 @@ SCP_vector> MissionSpecDialogModel::getMission } void MissionSpecDialogModel::setMissionFullWar(bool enabled) { - if (_m_full_war != enabled) { - _m_full_war = enabled; + if (_m_flags[Mission::Mission_Flags::All_attack] != enabled) { _m_flags.set(Mission::Mission_Flags::All_attack, enabled); set_modified(); modelChanged(); diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.h b/qtfred/src/mission/dialogs/MissionSpecDialogModel.h index 5e76d03720f..e6596cf4b7c 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; From 85deb2bf33c95ea69e94dcf99a5cfed012a9ed7d Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:39:17 -0800 Subject: [PATCH 04/11] Mission goals editors: clear the selection when a goal is deleted After a goal was deleted, both editors kept the deleted goal's slot as the current goal. In qtFRED, typing in the name box then dereferenced a null tree item and crashed. In FRED, when no row was left for the tree to select, the fields stayed filled and enabled, and editing them wrote to whichever goal had moved into that slot (one hidden by the display type filter, for example) or past the end of the list. Deleting a goal now clears the current goal in both editors. FRED then follows the row its tree selects next, if there is one; qtFRED leaves nothing selected. Also in qtFRED: the Objective Invalid and Don't Play Completion Music checkboxes had handlers whose signature matched no checkbox signal, so Qt never connected them and ticking either one changed nothing. The completion music box also read the wrong field when a goal was selected. --- fred2/missiongoalsdlg.cpp | 4 ++++ .../mission/dialogs/MissionGoalsDialogModel.cpp | 2 ++ qtfred/src/ui/dialogs/MissionGoalsDialog.cpp | 17 +++++++++++------ qtfred/src/ui/dialogs/MissionGoalsDialog.h | 4 ++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/fred2/missiongoalsdlg.cpp b/fred2/missiongoalsdlg.cpp index a50058495ac..2c2a52eba76 100644 --- a/fred2/missiongoalsdlg.cpp +++ b/fred2/missiongoalsdlg.cpp @@ -71,6 +71,10 @@ int CMissionGoalsDlg::onRootDeleted(int formula_node) m_goals.erase(m_goals.begin() + i); m_sig.erase(m_sig.begin() + i); + // if a row is left the tree selects it next and sets this again; if none is, the fields must not stay live + cur_goal = -1; + update_cur_goal(); + return formula_node; } void CMissionGoalsDlg::onRootInserted(int old_formula, int new_formula) { insert_handler(old_formula, new_formula); } diff --git a/qtfred/src/mission/dialogs/MissionGoalsDialogModel.cpp b/qtfred/src/mission/dialogs/MissionGoalsDialogModel.cpp index 0c0a1c9f6e0..7baf8de5fd0 100644 --- a/qtfred/src/mission/dialogs/MissionGoalsDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionGoalsDialogModel.cpp @@ -113,6 +113,8 @@ void MissionGoalsDialogModel::deleteGoal(int node) { Assert(i < m_goals.size()); m_goals.erase(m_goals.begin() + i); m_sig.erase(m_sig.begin() + i); + // the index now names whichever goal moved into this slot, so no goal is current until one is selected + cur_goal = -1; set_modified(); modelChanged(); diff --git a/qtfred/src/ui/dialogs/MissionGoalsDialog.cpp b/qtfred/src/ui/dialogs/MissionGoalsDialog.cpp index 850b542642e..1d12920f20e 100644 --- a/qtfred/src/ui/dialogs/MissionGoalsDialog.cpp +++ b/qtfred/src/ui/dialogs/MissionGoalsDialog.cpp @@ -102,7 +102,7 @@ void MissionGoalsDialog::updateUi() ui->goalDescription->setText(QString::fromUtf8(goal.message.c_str())); ui->goalTypeCombo->setCurrentIndex(goal.type & GOAL_TYPE_MASK); ui->objectiveInvalidCheck->setChecked((goal.type & INVALID_GOAL) != 0); - ui->noCompletionMusicCheck->setChecked((goal.type & MGF_NO_MUSIC) != 0); + ui->noCompletionMusicCheck->setChecked((goal.flags & MGF_NO_MUSIC) != 0); ui->goalScore->setValue(goal.score); ui->goalTeamCombo->setCurrentIndex(goal.team); @@ -187,6 +187,9 @@ void MissionGoalsDialog::on_goalName_textChanged(const QString& text) _model->setCurrentGoalName(text.toUtf8().constData()); auto item = ui->goalEventTree->currentItem(); + if (item == nullptr) { + return; + } while (item->parent() != nullptr) { item = item->parent(); } @@ -214,17 +217,17 @@ void MissionGoalsDialog::on_goalTeamCombo_currentIndexChanged(int team) } } -void MissionGoalsDialog::on_objectiveInvalidCheck_stateChanged(bool checked) +void MissionGoalsDialog::on_objectiveInvalidCheck_stateChanged(int state) { if (_model->isCurrentGoalValid()) { - _model->setCurrentGoalInvalid(checked); + _model->setCurrentGoalInvalid(state == Qt::Checked); } } -void MissionGoalsDialog::on_noCompletionMusicCheck_stateChanged(bool checked) +void MissionGoalsDialog::on_noCompletionMusicCheck_stateChanged(int state) { if (_model->isCurrentGoalValid()) { - _model->setCurrentGoalNoMusic(checked); + _model->setCurrentGoalNoMusic(state == Qt::Checked); } } @@ -239,9 +242,11 @@ void MissionGoalsDialog::on_goalEventTree_selectedRootChanged(int formula) for (size_t i = 0; i < goals.size(); ++i) { if (goals[i].formula == formula) { _model->setCurrentGoal(static_cast(i)); - break; + return; } } + // the tree reports no row after a delete; without this the fields would keep editing another goal + _model->setCurrentGoal(-1); } void MissionGoalsDialog::on_goalEventTree_rootNodeDeleted(int node) diff --git a/qtfred/src/ui/dialogs/MissionGoalsDialog.h b/qtfred/src/ui/dialogs/MissionGoalsDialog.h index 994a2f73f28..5f90d45a3f5 100644 --- a/qtfred/src/ui/dialogs/MissionGoalsDialog.h +++ b/qtfred/src/ui/dialogs/MissionGoalsDialog.h @@ -37,8 +37,8 @@ private slots: void on_goalDescription_textChanged(const QString& text); void on_goalScore_valueChanged(int value); void on_goalTeamCombo_currentIndexChanged(int team); - void on_objectiveInvalidCheck_stateChanged(bool checked); - void on_noCompletionMusicCheck_stateChanged(bool checked); + void on_objectiveInvalidCheck_stateChanged(int state); + void on_noCompletionMusicCheck_stateChanged(int state); void on_newObjectiveBtn_clicked(); void on_goalEventTree_selectedRootChanged(int formula); From 71d55b623cab7e501b96b533e3deff38176c19a3 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:39:17 -0800 Subject: [PATCH 05/11] Mission cutscenes editors: clear the selection when a cutscene is deleted The same fault as in the mission goals editors: after a cutscene was deleted, both editors kept its slot as the current cutscene. qtFRED crashed on the next keystroke in the filename box. FRED left the type and filename fields filled and enabled when no row was left to select. Deleting a cutscene now clears the current cutscene in both editors. FRED then follows the row its tree selects next, if there is one; qtFRED leaves nothing selected. --- fred2/missioncutscenesdlg.cpp | 4 ++++ qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp | 2 ++ qtfred/src/ui/dialogs/MissionCutscenesDialog.cpp | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fred2/missioncutscenesdlg.cpp b/fred2/missioncutscenesdlg.cpp index 79dca1e5be2..35102a6567c 100644 --- a/fred2/missioncutscenesdlg.cpp +++ b/fred2/missioncutscenesdlg.cpp @@ -71,6 +71,10 @@ int CMissionCutscenesDlg::onRootDeleted(int formula_node) m_cutscenes.erase(m_cutscenes.begin() + i); m_sig.erase(m_sig.begin() + i); + // if a row is left the tree selects it next and sets this again; if none is, the fields must not stay live + cur_cutscene = -1; + update_cur_cutscene(); + return formula_node; } void CMissionCutscenesDlg::onRootInserted(int old_formula, int new_formula) { insert_handler(old_formula, new_formula); } diff --git a/qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp b/qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp index 4fff71f57f2..3fd5331cfde 100644 --- a/qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp @@ -103,6 +103,8 @@ void MissionCutscenesDialogModel::deleteCutscene(int node) Assertion(i < m_cutscenes.size(), "Invalid cutscene index!"); m_cutscenes.erase(m_cutscenes.begin() + i); m_sig.erase(m_sig.begin() + i); + // the index now names whichever cutscene moved into this slot, so none is current until one is selected + cur_cutscene = -1; set_modified(); modelChanged(); diff --git a/qtfred/src/ui/dialogs/MissionCutscenesDialog.cpp b/qtfred/src/ui/dialogs/MissionCutscenesDialog.cpp index ac41021f466..14a9d0d3701 100644 --- a/qtfred/src/ui/dialogs/MissionCutscenesDialog.cpp +++ b/qtfred/src/ui/dialogs/MissionCutscenesDialog.cpp @@ -200,6 +200,9 @@ void MissionCutscenesDialog::on_cutsceneFilename_textChanged(const QString& text _model->setCurrentCutsceneFilename(text.toUtf8().constData()); auto item = ui->cutsceneEventTree->currentItem(); + if (item == nullptr) { + return; + } while (item->parent() != nullptr) { item = item->parent(); } @@ -219,9 +222,11 @@ void MissionCutscenesDialog::on_cutsceneEventTree_selectedRootChanged(int formul for (size_t i = 0; i < cutscenes.size(); ++i) { if (cutscenes[i].formula == formula) { _model->setCurrentCutscene(static_cast(i)); - break; + return; } } + // the tree reports no row after a delete; without this the fields would keep editing another cutscene + _model->setCurrentCutscene(-1); } void MissionCutscenesDialog::on_cutsceneEventTree_rootNodeDeleted(int node) From 8955e01b7438404664fff5b2a7bf5b8e8f821235 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 03:22:10 -0800 Subject: [PATCH 06/11] qtFRED team loadout: load the skip-validation setting The dialog saved Skip FRED's Weapon Loadout Validation but never read it back, so the box was always unticked when the dialog opened and the next OK cleared the setting. It is now read from the team data, as FRED does. --- qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp b/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp index 4307d73dd6b..4f81b19d017 100644 --- a/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp +++ b/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp @@ -216,6 +216,7 @@ void TeamLoadoutDialogModel::initializeData() // now merge in the data from Team_data const auto& teamData = Team_data[i]; + team.skipValidation = teamData.do_not_validate; // first the ships for (const auto &sc : teamData.ship_choices) { From ec05013f92df470d620211a0a2d4d04c97813d38 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 03:24:39 -0800 Subject: [PATCH 07/11] qtFRED: give each ship group its own bit Set Group and Group used the group number 1 to 9 as the bit mask itself, so group 3 was groups 1 and 2 together, and setting it cleared ships out of those two. FRED uses one bit per group (1 << n), which is also what a saved mission's +Group value means. qtFRED now does the same. --- qtfred/src/ui/FredView.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/qtfred/src/ui/FredView.cpp b/qtfred/src/ui/FredView.cpp index a17fef0d342..4fc1e3f4913 100644 --- a/qtfred/src/ui/FredView.cpp +++ b/qtfred/src/ui/FredView.cpp @@ -2933,11 +2933,14 @@ void FredView::initializeGroupActions() { connect(ui->actionSetGroup_9, &QAction::triggered, this, [this]() { onSetGroup(9); }); } void FredView::onGroupSelected(int group) { + // a ship's group field holds one bit per group, as FRED writes it + const int mask = 1 << (group - 1); + fred->unmark_all(); auto objp = GET_FIRST(&obj_used_list); while (objp != END_OF_LIST(&obj_used_list)) { if (objp->type == OBJ_SHIP) { - if (Ships[objp->instance].group & group) { + if (Ships[objp->instance].group & mask) { fred->markObject(OBJ_INDEX(objp)); } } @@ -2946,17 +2949,18 @@ void FredView::onGroupSelected(int group) { } } void FredView::onSetGroup(int group) { + const int mask = 1 << (group - 1); bool err = false; for (auto i = 0; i < MAX_SHIPS; i++) { - Ships[i].group &= ~group; + Ships[i].group &= ~mask; } auto objp = GET_FIRST(&obj_used_list); while (objp != END_OF_LIST(&obj_used_list)) { if (objp->flags[Object::Object_Flags::Marked]) { if (objp->type == OBJ_SHIP) { - Ships[objp->instance].group |= group; + Ships[objp->instance].group |= mask; } else { err = true; From 98ddbe5253c1e9415091ee599a8ca3afa2570d79 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 04:00:24 -0800 Subject: [PATCH 08/11] qtFRED ship special stats: stop writing to the first ship in the mission The dialog kept its list of selected ships in a vector sized for every possible ship, filled only the first few entries, and then applied the values to all of them. The unused entries were zero, so every OK also wrote the special hitpoints, shields and explosion settings to ship 0, which is usually the player. The list now holds only the selected ships, and the separate count that indexed it is gone. --- .../dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp | 6 ++---- .../dialogs/ShipEditor/ShipSpecialStatsDialogModel.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp b/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp index 93bc0f5c88d..646ef6278fd 100644 --- a/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp +++ b/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.cpp @@ -11,15 +11,13 @@ ShipSpecialStatsDialogModel::ShipSpecialStatsDialogModel(QObject* parent, Editor void ShipSpecialStatsDialogModel::initializeData() { object* objp; - _numSelectedShips = 0; - _selectedShips.resize(MAX_SHIPS); + _selectedShips.clear(); objp = GET_FIRST(&obj_used_list); while (objp != END_OF_LIST(&obj_used_list)) { if ((objp->type == OBJ_START) || (objp->type == OBJ_SHIP)) { if (objp->flags[Object::Object_Flags::Marked]) { - _selectedShips[_numSelectedShips] = objp->instance; - _numSelectedShips++; + _selectedShips.push_back(objp->instance); } } objp = GET_NEXT(objp); diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.h b/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.h index fdef763b75c..586a5c877d6 100644 --- a/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.h +++ b/qtfred/src/mission/dialogs/ShipEditor/ShipSpecialStatsDialogModel.h @@ -44,7 +44,6 @@ class ShipSpecialStatsDialogModel : public AbstractDialogModel { void initializeData(); int _ship; - int _numSelectedShips; SCP_vector _selectedShips; bool _specialExp; From d80c5ef1696939b9315fed8aee46358880a90406 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 11:55:52 -0800 Subject: [PATCH 09/11] Take the All Teams at War change out of this pull request It moves to its own pull request, which stores the setting as a mission flag, as asked in the review. This reverts commit 93e776761. --- qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp | 10 ++++------ qtfred/src/mission/dialogs/MissionSpecDialogModel.h | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp index 2afb307b706..132eac7c28a 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp @@ -36,11 +36,10 @@ 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; - // the game and the save code read Mission_all_attack, not this flag, so the checkbox has to follow it - _m_flags.set(Mission::Mission_Flags::All_attack, Mission_all_attack != 0); _m_loading_640 = The_mission.loading_screen[GR_640]; _m_loading_1024 = The_mission.loading_screen[GR_1024]; @@ -147,8 +146,6 @@ bool MissionSpecDialogModel::apply() { // Copy mission flags The_mission.flags = _m_flags; - // all-attack is saved as its own line, as FRED does; the flag bit itself stays out of the file - The_mission.flags.remove(Mission::Mission_Flags::All_attack); // set ship trail threshold if (_m_contrail_threshold_flag) { @@ -195,7 +192,7 @@ bool MissionSpecDialogModel::apply() { else strcpy_s(The_mission.command_sender, _m_command_sender.c_str()); - Mission_all_attack = _m_flags[Mission::Mission_Flags::All_attack] ? 1 : 0; + Mission_all_attack = (int)_m_full_war; // update the Num_teams variable accoriding to mission types Num_teams = 1; @@ -512,7 +509,8 @@ SCP_vector> MissionSpecDialogModel::getMission } void MissionSpecDialogModel::setMissionFullWar(bool enabled) { - if (_m_flags[Mission::Mission_Flags::All_attack] != enabled) { + if (_m_full_war != enabled) { + _m_full_war = enabled; _m_flags.set(Mission::Mission_Flags::All_attack, enabled); set_modified(); modelChanged(); diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.h b/qtfred/src/mission/dialogs/MissionSpecDialogModel.h index e6596cf4b7c..5e76d03720f 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.h +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.h @@ -64,6 +64,7 @@ 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; From f3afffd98768e69803a33d15fbad55db0085d1d0 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 06:18:51 -0800 Subject: [PATCH 10/11] Start a ship's editor group at 0, not -1 A ship's group field is a set of bits, one per editor group, and 0 means no group. Ship creation set it to 0 until 2013 and the mission parser did until 2022; both now start at -1, which has every bit set. A ship placed in the editor, or loaded from a mission with no +Group line, therefore answered to every group, and its group was never saved because the save code skips negative values. Both defaults are 0 again, and the two comments describe the field as it is used. A mission that has no +Group lines gains "+Group: 0" on every ship the next time it is saved, the form retail missions such as SM1-01 already have. --- code/mission/missionparse.h | 2 +- code/ship/ship.cpp | 2 +- code/ship/ship.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/mission/missionparse.h b/code/mission/missionparse.h index f4141ae0da1..d8e827ef216 100644 --- a/code/mission/missionparse.h +++ b/code/mission/missionparse.h @@ -491,7 +491,7 @@ class p_object util::reset_on_move dock_list; // Goober5000 - parse objects this parse object is docked to object *created_object = nullptr; // Goober5000 int collision_group_id = 0; // Goober5000 - int group = -1; // group object is within or -1 if none. + int group = 0; // one bit per group the object is in, 0 if none. SCP_string fred_layer = "Default"; int persona_index = -1; int kamikaze_damage = 0; // base damage for a kamikaze attack diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp index afcf7385176..18d0f957cb2 100644 --- a/code/ship/ship.cpp +++ b/code/ship/ship.cpp @@ -7038,7 +7038,7 @@ void ship::clear() num_turret_swarm_info = 0; swarm_missile_bank = -1; - group = -1; + group = 0; fred_layer = "Default"; death_roll_snd = sound_handle::invalid(); ship_list_index = -1; diff --git a/code/ship/ship.h b/code/ship/ship.h index 1a40e5157b1..420f8ea7490 100644 --- a/code/ship/ship.h +++ b/code/ship/ship.h @@ -783,7 +783,7 @@ class ship int num_turret_swarm_info; // number of turrets in process of launching swarm int swarm_missile_bank; // The missilebank the swarm was originally launched from - int group; // group ship is in, or -1 if none. Fred thing + int group; // one bit per group the ship is in, 0 if none. Fred thing SCP_string fred_layer = "Default"; // FRED view layer assignment sound_handle death_roll_snd; // id of death roll sound, may need to be stopped early int ship_list_index; // index of ship in Ship_objs[] array From fe5530f219ebde8a6320db574e11dfa320460950 Mon Sep 17 00:00:00 2001 From: Dustinspace217 Date: Wed, 11 Nov 2026 23:31:44 -0800 Subject: [PATCH 11/11] Take the selection group changes out of this pull request This reverts ec05013f9 and f3afffd98. #8030 fixes the same selection group bug in both editors with shared helpers that keep -1 for "no group", so saved missions do not change. Dropping this version avoids a conflict in FredView.cpp. --- code/mission/missionparse.h | 2 +- code/ship/ship.cpp | 2 +- code/ship/ship.h | 2 +- qtfred/src/ui/FredView.cpp | 10 +++------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/mission/missionparse.h b/code/mission/missionparse.h index d8e827ef216..f4141ae0da1 100644 --- a/code/mission/missionparse.h +++ b/code/mission/missionparse.h @@ -491,7 +491,7 @@ class p_object util::reset_on_move dock_list; // Goober5000 - parse objects this parse object is docked to object *created_object = nullptr; // Goober5000 int collision_group_id = 0; // Goober5000 - int group = 0; // one bit per group the object is in, 0 if none. + int group = -1; // group object is within or -1 if none. SCP_string fred_layer = "Default"; int persona_index = -1; int kamikaze_damage = 0; // base damage for a kamikaze attack diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp index 18d0f957cb2..afcf7385176 100644 --- a/code/ship/ship.cpp +++ b/code/ship/ship.cpp @@ -7038,7 +7038,7 @@ void ship::clear() num_turret_swarm_info = 0; swarm_missile_bank = -1; - group = 0; + group = -1; fred_layer = "Default"; death_roll_snd = sound_handle::invalid(); ship_list_index = -1; diff --git a/code/ship/ship.h b/code/ship/ship.h index 420f8ea7490..1a40e5157b1 100644 --- a/code/ship/ship.h +++ b/code/ship/ship.h @@ -783,7 +783,7 @@ class ship int num_turret_swarm_info; // number of turrets in process of launching swarm int swarm_missile_bank; // The missilebank the swarm was originally launched from - int group; // one bit per group the ship is in, 0 if none. Fred thing + int group; // group ship is in, or -1 if none. Fred thing SCP_string fred_layer = "Default"; // FRED view layer assignment sound_handle death_roll_snd; // id of death roll sound, may need to be stopped early int ship_list_index; // index of ship in Ship_objs[] array diff --git a/qtfred/src/ui/FredView.cpp b/qtfred/src/ui/FredView.cpp index 4fc1e3f4913..a17fef0d342 100644 --- a/qtfred/src/ui/FredView.cpp +++ b/qtfred/src/ui/FredView.cpp @@ -2933,14 +2933,11 @@ void FredView::initializeGroupActions() { connect(ui->actionSetGroup_9, &QAction::triggered, this, [this]() { onSetGroup(9); }); } void FredView::onGroupSelected(int group) { - // a ship's group field holds one bit per group, as FRED writes it - const int mask = 1 << (group - 1); - fred->unmark_all(); auto objp = GET_FIRST(&obj_used_list); while (objp != END_OF_LIST(&obj_used_list)) { if (objp->type == OBJ_SHIP) { - if (Ships[objp->instance].group & mask) { + if (Ships[objp->instance].group & group) { fred->markObject(OBJ_INDEX(objp)); } } @@ -2949,18 +2946,17 @@ void FredView::onGroupSelected(int group) { } } void FredView::onSetGroup(int group) { - const int mask = 1 << (group - 1); bool err = false; for (auto i = 0; i < MAX_SHIPS; i++) { - Ships[i].group &= ~mask; + Ships[i].group &= ~group; } auto objp = GET_FIRST(&obj_used_list); while (objp != END_OF_LIST(&obj_used_list)) { if (objp->flags[Object::Object_Flags::Marked]) { if (objp->type == OBJ_SHIP) { - Ships[objp->instance].group |= mask; + Ships[objp->instance].group |= group; } else { err = true;