Merge pull request #7273 from Goober5000/more_fred_fixes_b

more FRED fixes when dialogs pop up, part 2

Author: Goober5000

fred2/fredrender.cpp

@@ -1823,6 +1823,8 @@ void render_one_model_htl(object *objp) {
 	// if this object isn't fully created yet, don't render it
 	if (objp->type == OBJ_SHIP && Ships[objp->instance].create_time == 0)
 		return;
+	if (objp->type == OBJ_PROP && (!Props[objp->instance].has_value() || Props[objp->instance].value().create_time == 0))
+		return;
 
 	if (objp->type == OBJ_JUMP_NODE) {
 		return;

fred2/management.cpp

@@ -1162,7 +1162,7 @@ int update_dialog_boxes()
 		return z;
 	}
 
-	z = Prop_editor_dialog.update_data();
+	z = Prop_editor_dialog.update_data(0);
 	if (z) {
 		nprintf(("Fred routing", "prop dialog save failed\n"));
 		Prop_editor_dialog.SetWindowPos(&Fred_main_wnd->wndTop, 0, 0, 0, 0,

fred2/propdlg.cpp

@@ -128,7 +128,7 @@ void prop_dlg::initialize_data(int full_update)
 	m_flags_list.EnableWindow(enable);
 }
 
-int prop_dlg::update_data()
+int prop_dlg::update_data(int redraw)
 {
 	if (!GetSafeHwnd())
 		return 0;
@@ -185,7 +185,9 @@ int prop_dlg::update_data()
 		}
 	}
 
-	update_map_window();
+	if (redraw)
+		update_map_window();
+
 	return 0;
 }
 

fred2/propdlg.h

@@ -6,7 +6,7 @@ class prop_dlg : public CDialog {
   public:
 	int bypass_errors;
 	BOOL Create();
-	int update_data();
+	int update_data(int redraw = 1);
 	void initialize_data(int full_update);
 	void OnOK();
 	prop_dlg(CWnd* pParent = NULL); // standard constructor

qtfred/src/mission/FredRenderer.cpp

@@ -27,6 +27,7 @@
 #include <mod_table/mod_table.h>
 
 #include "mission/object.h"
+#include "prop/prop.h"
 #include "weapon/weapon.h"
 
 
@@ -797,6 +798,8 @@ void FredRenderer::render_one_model_htl(object* objp,
 	// if this object isn't fully created yet, don't render it
 	if (objp->type == OBJ_SHIP && Ships[objp->instance].create_time == 0)
 		return;
+	if (objp->type == OBJ_PROP && (!Props[objp->instance].has_value() || Props[objp->instance].value().create_time == 0))
+		return;
 
 	if (objp->type == OBJ_JUMP_NODE) {
 		return;