Skip to content

Fix assert for flag list and player ships #7415

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

Merged
wookieejedi merged 1 commit into from
May 1, 2026
+19 −8
Merged

Fix assert for flag list and player ships #7415

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
10 changes: 9 additions & 1 deletion qtfred/src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,15 @@ std::pair<SCP_string, int>* ShipFlagsDialogModel::getFlag(const SCP_string& flag
return &flag;
}
}
Assertion(false, "Illegal flag name \"[%s]\"", flag_name.c_str());
// Only assert if the name isn't a known flag at all; it may have been legitimately filtered out for ship starts
bool known = false;
for (size_t i = 0; i < Num_Parse_ship_flags && !known; ++i)
known = !stricmp(flag_name.c_str(), Parse_ship_flags[i].name);
for (size_t i = 0; i < Num_Parse_ship_ai_flags && !known; ++i)
known = !stricmp(flag_name.c_str(), Parse_ship_ai_flags[i].name);
for (size_t i = 0; i < Num_Parse_ship_object_flags && !known; ++i)
known = !stricmp(flag_name.c_str(), Parse_ship_object_flags[i].name);
Assertion(known, "Illegal flag name \"%s\"", flag_name.c_str());
return nullptr;
}

Expand Down
17 changes: 10 additions & 7 deletions qtfred/src/ui/dialogs/ShipEditor/ShipFlagsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,19 @@ void ShipFlagsDialog::updateUI()
{
util::SignalBlockers blockers(this);
ui->destroySecondsSpinBox->setValue(_model->getDestroyTime());
ui->destroyedlabel->setVisible(_model->getFlag("Destroy before Mission")->second);
ui->destroySecondsSpinBox->setVisible(_model->getFlag("Destroy before Mission")->second);
ui->destroySecondsLabel->setVisible(_model->getFlag("Destroy before Mission")->second);
auto* destroyFlag = _model->getFlag("Destroy before Mission");
ui->destroyedlabel->setVisible(destroyFlag && destroyFlag->second);
ui->destroySecondsSpinBox->setVisible(destroyFlag && destroyFlag->second);
ui->destroySecondsLabel->setVisible(destroyFlag && destroyFlag->second);

auto* escortFlag = _model->getFlag("escort");
ui->escortPrioritySpinBox->setValue(_model->getEscortPriority());
ui->escortLabel->setVisible(_model->getFlag("escort")->second);
ui->escortPrioritySpinBox->setVisible(_model->getFlag("escort")->second);
ui->escortLabel->setVisible(escortFlag && escortFlag->second);
ui->escortPrioritySpinBox->setVisible(escortFlag && escortFlag->second);

auto* kamikazeFlag = _model->getFlag("kamikaze");
ui->kamikazeDamageSpinBox->setValue(_model->getKamikazeDamage());
ui->kamikazeLabel->setVisible(_model->getFlag("kamikaze")->second);
ui->kamikazeDamageSpinBox->setVisible(_model->getFlag("kamikaze")->second);
ui->kamikazeLabel->setVisible(kamikazeFlag && kamikazeFlag->second);
ui->kamikazeDamageSpinBox->setVisible(kamikazeFlag && kamikazeFlag->second);
}
} // namespace fso::fred::dialogs
Loading