Skip to content

fix ship registry updating in FRED #7492

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
Goober5000 merged 1 commit into from
Jun 2, 2026
Merged

fix ship registry updating in FRED #7492

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
9 changes: 9 additions & 0 deletions fred2/management.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,15 @@ int rename_ship(int ship, const char *name)
if (i >= 0)
strcpy_s(Reinforcements[i].name, name);

// keep the ship registry in sync
auto reg_it = Ship_registry_map.find(Ships[ship].ship_name);
if (reg_it != Ship_registry_map.end()) {
int reg_idx = reg_it->second;
Ship_registry_map.erase(reg_it);
strcpy_s(Ship_registry[reg_idx].name, name);
Ship_registry_map[name] = reg_idx;
}

strcpy_s(Ships[ship].ship_name, name);
if (ship == cur_ship)
Ship_editor_dialog.m_ship_name = _T(name);
Expand Down
9 changes: 9 additions & 0 deletions qtfred/src/mission/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,15 @@ int Editor::rename_ship(int ship, const char* name) {
if (i >= 0)
strcpy_s(Reinforcements[i].name, name);

// keep the ship registry in sync
auto reg_it = Ship_registry_map.find(Ships[ship].ship_name);
if (reg_it != Ship_registry_map.end()) {
int reg_idx = reg_it->second;
Ship_registry_map.erase(reg_it);
strcpy_s(Ship_registry[reg_idx].name, name);
Ship_registry_map[name] = reg_idx;
}

strcpy_s(Ships[ship].ship_name, name);

// if this name has a hash, create a default display name
Expand Down
Loading