Merge pull request scp-fs2open#5996 from Goober5000/fix_ship_name_in_…

…use_bug fix "this ship name is already in use" bug
Goober5000 · Feb 26, 2024 · 1fe62ea · 1fe62ea
2 parents 687694c + da31995
commit 1fe62ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fred2/shipeditordlg.cpp b/fred2/shipeditordlg.cpp
@@ -1085,7 +1085,7 @@ int CShipEditorDlg::update_data(int redraw)
 		m_ship_name.TrimRight(); 
 		ptr = GET_FIRST(&obj_used_list);
 		while (ptr != END_OF_LIST(&obj_used_list)) {
-			if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (cur_object_index != OBJ_INDEX(ptr))) {
+			if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (single_ship != ptr->instance)) {
 				str = Ships[ptr->instance].ship_name;
 				if (!stricmp(m_ship_name, str)) {
 					if (bypass_errors)

diff --git a/qtfred/src/mission/dialogs/ShipEditorDialogModel.cpp b/qtfred/src/mission/dialogs/ShipEditorDialogModel.cpp
@@ -429,7 +429,7 @@ namespace fso {
 					drop_white_space(_m_ship_name);
 					ptr = GET_FIRST(&obj_used_list);
 					while (ptr != END_OF_LIST(&obj_used_list)) {
-						if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (_editor->currentObject != OBJ_INDEX(ptr))) {
+						if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) && (single_ship != ptr->instance)) {
 							str = Ships[ptr->instance].ship_name;
 							if (!stricmp(_m_ship_name.c_str(), str)) {
 								auto button = _viewport->dialogProvider->showButtonDialog(DialogType::Error,