Add prop editor dialog in FRED

Author: MjnMixael

code/mission/missionparse.cpp

@@ -405,6 +405,16 @@ parse_object_flag_description<Mission::Parse_Object_Flags> Parse_object_flag_des
 
 const size_t Num_parse_object_flags = sizeof(Parse_object_flags) / sizeof(flag_def_list_new<Mission::Parse_Object_Flags>);
 
+flag_def_list_new<Mission::Parse_Object_Flags> Parse_prop_flags[] = {
+    { "no_collide",						Mission::Parse_Object_Flags::OF_No_collide,				true, false },
+};
+
+parse_object_flag_description<Mission::Parse_Object_Flags> Parse_prop_flag_descriptions[] = {
+    { Mission::Parse_Object_Flags::OF_No_collide,					"Prop cannot be collided with."},
+};
+
+const size_t Num_parse_prop_flags = sizeof(Parse_prop_flags) / sizeof(flag_def_list_new<Mission::Parse_Object_Flags>);
+
 // These are only the flags that are saved to the mission file.  See the MEF_ #defines.
 flag_def_list Mission_event_flags[] = {
 	{ "interval & delay use msecs", MEF_USE_MSECS, 0 },
@@ -4954,6 +4964,17 @@ void parse_prop(mission* pm)
 	required_string("$Orientation:");
 	stuff_matrix(&prop.orientation);
 
+	// set flags
+	if (optional_string("+Flags:")) {
+		SCP_vector<SCP_string> unparsed;
+		parse_string_flag_list(prop.flags, Parse_prop_flags, Num_parse_prop_flags, &unparsed);
+		if (!unparsed.empty()) {
+			for (size_t k = 0; k < unparsed.size(); ++k) {
+				WarningEx(LOCATION, "Unknown flag in parse prop flags: %s", unparsed[k].c_str());
+			}
+		}
+	}
+
 	Parse_props.emplace_back(prop);
 }
 
@@ -5065,7 +5086,15 @@ void post_process_props()
 {
 	for (int i = 0; i < static_cast<int>(Parse_props.size()); i++) {
 		parsed_prop* propp = &Parse_props[i];
-		prop_create(&propp->orientation, &propp->position, propp->prop_info_index, propp->name);
+		int objnum = prop_create(&propp->orientation, &propp->position, propp->prop_info_index, propp->name);
+
+		if (objnum >= 0) {
+			auto& obj = Objects[objnum];
+
+			if (propp->flags[Mission::Parse_Object_Flags::OF_No_collide]) {
+				obj.flags.remove(Object::Object_Flags::Collides);
+			}
+		}
 	}
 }
 

code/mission/missionparse.h

@@ -275,6 +275,9 @@ extern char *Object_flags[];
 extern flag_def_list_new<Mission::Parse_Object_Flags> Parse_object_flags[];
 extern parse_object_flag_description<Mission::Parse_Object_Flags> Parse_object_flag_descriptions[];
 extern const size_t Num_parse_object_flags;
+extern flag_def_list_new<Mission::Parse_Object_Flags> Parse_prop_flags[];
+extern parse_object_flag_description<Mission::Parse_Object_Flags> Parse_prop_flag_descriptions[];
+extern const size_t Num_parse_prop_flags;
 extern const char *Icon_names[];
 extern const char *Mission_event_log_flags[];
 

code/prop/prop.cpp

@@ -154,7 +154,9 @@ void prop_init()
 {
 
 	// first parse the default table
-	parse_prop_table("props.tbl");
+	if (cf_exists_full("props.tbl", CF_TYPE_TABLES)) {
+		parse_prop_table("props.tbl");
+	}
 
 	// parse any modular tables
 	parse_modular_table("*-prp.tbm", parse_prop_table);
@@ -196,7 +198,7 @@ int prop_create(matrix* orient, vec3d* pos, int prop_type, const char* name)
 		char base_name[NAME_LENGTH];
 		char suffix[NAME_LENGTH];
 		strcpy_s(base_name, Prop_info[prop_type].name);
-		sprintf(suffix, NOX(" %d"), Props.size());
+		sprintf(suffix, NOX(" %d"), static_cast<int>(Props.size()));
 
 		// start building name
 		strcpy_s(propp->prop_name, base_name);

code/prop/prop.h

@@ -2,6 +2,7 @@
 
 #include "globalincs/pstypes.h"
 
+#include "mission/mission_flags.h"
 #include "object/object.h"
 #include "prop/prop_flags.h"
 #include "ship/ship.h"
@@ -29,14 +30,15 @@ typedef struct prop {
 	float alpha_mult;
 	// glow points
 	std::deque<bool> glow_point_bank_active;
-	flagset<Prop::Prop_Flags> flags;     // Render flags
+	flagset<Prop::Prop_Flags> flags;
 } prop;
 
 typedef struct parsed_prop {
 	char name[NAME_LENGTH];
 	int prop_info_index;
 	matrix orientation;
 	vec3d position;
+	flagset<Mission::Parse_Object_Flags> flags;
 } parsed_prop;
 
 // Global prop info array

fred2/CMakeLists.txt

@@ -103,6 +103,8 @@ set(FRED2_SOURCES
 	playerstarteditor.h
 	prefsdlg.cpp
 	prefsdlg.h
+	propdlg.cpp
+	propdlg.h
 	reinforcementeditordlg.cpp
 	reinforcementeditordlg.h
 	resource.h

fred2/fred.cpp

@@ -116,6 +116,7 @@ int Show_cpu = 0;
 
 CWnd*                Prev_window;
 CShipEditorDlg       Ship_editor_dialog;
+prop_dlg             Prop_editor_dialog;
 wing_editor          Wing_editor_dialog;
 waypoint_path_dlg    Waypoint_editor_dialog;
 jumpnode_dlg         Jumpnode_editor_dialog;
@@ -125,6 +126,7 @@ briefing_editor_dlg* Briefing_dialog = NULL;
 
 window_data Main_wnd_data;
 window_data Ship_wnd_data;
+window_data Prop_wnd_data;
 window_data Wing_wnd_data;
 window_data Object_wnd_data;
 window_data Mission_goals_wnd_data;
@@ -249,6 +251,7 @@ BOOL CFREDApp::InitInstance() {
 
 	read_window("Main window", &Main_wnd_data);
 	read_window("Ship window", &Ship_wnd_data);
+	read_window("Prop window", &Prop_wnd_data);
 	read_window("Wing window", &Wing_wnd_data);
 	read_window("Waypoint window", &Waypoint_wnd_data);
 	read_window("Jumpnode window", &Jumpnode_wnd_data);
@@ -391,6 +394,7 @@ BOOL CFREDApp::OnIdle(LONG lCount) {
 	if (!app_init) {
 		app_init = 1;
 		theApp.init_window(&Ship_wnd_data, &Ship_editor_dialog, 0, 1);
+		theApp.init_window(&Prop_wnd_data, &Prop_editor_dialog, 0, 1);
 		theApp.init_window(&Wing_wnd_data, &Wing_editor_dialog, 0, 1);
 		theApp.init_window(&MusPlayer_wnd_data, &Music_player_dialog, 0, 1);
 		theApp.init_window(&Waypoint_wnd_data, &Waypoint_editor_dialog, 0, 1);
@@ -427,6 +431,11 @@ BOOL CFREDApp::OnIdle(LONG lCount) {
 		Update_wing = 0;
 	}
 
+	if (Update_prop) {
+		Prop_editor_dialog.initialize_data(1);
+		Update_prop = 0;
+	}
+
 	Prev_window = CFREDView::GetActiveWindow();
 
 	// Find the root window of the active window
@@ -546,10 +555,12 @@ void CFREDApp::write_ini_file(int degree) {
 		record_window_data(&MusPlayer_wnd_data, &Music_player_dialog);
 		record_window_data(&Wing_wnd_data, &Wing_editor_dialog);
 		record_window_data(&Ship_wnd_data, &Ship_editor_dialog);
+		record_window_data(&Prop_wnd_data, &Prop_editor_dialog);
 		record_window_data(&Main_wnd_data, Fred_main_wnd);
 
 		write_window("Main window", &Main_wnd_data);
 		write_window("Ship window", &Ship_wnd_data);
+		write_window("Prop window", &Prop_wnd_data);
 		write_window("Wing window", &Wing_wnd_data);
 		write_window("Waypoint window", &Waypoint_wnd_data);
 		write_window("Jumpnode window", &Jumpnode_wnd_data);

fred2/fred.h

@@ -19,6 +19,7 @@
 #include "BriefingEditorDlg.h"
 #include "resource.h"
 #include "ShipEditorDlg.h"
+#include "propdlg.h"
 #include "WaypointPathDlg.h"
 #include "JumpNodeDlg.h"
 #include "wing_editor.h"
@@ -180,6 +181,7 @@ extern HCURSOR h_cursor_rotate; //!< Cursor resource (icon) used for rotational
 
 extern CWnd*                Prev_window;            //!< The currently active window
 extern CShipEditorDlg       Ship_editor_dialog;     //!< The ship editor instance
+extern prop_dlg             Prop_editor_dialog;     //!< The prop editor instance
 extern wing_editor          Wing_editor_dialog;     //!< The wing editor instance
 extern waypoint_path_dlg    Waypoint_editor_dialog; //!< The waypoint editor instance
 extern jumpnode_dlg			Jumpnode_editor_dialog; //!< The jumpnode editor instance
@@ -191,6 +193,7 @@ extern CFREDApp theApp; //!< The application instance
 
 extern window_data Main_wnd_data;
 extern window_data Ship_wnd_data;
+extern window_data Prop_wnd_data;
 extern window_data Wing_wnd_data;
 extern window_data Object_wnd_data;
 extern window_data Mission_goals_wnd_data;

fred2/fred.rc

@@ -545,6 +545,14 @@ BEGIN
     END
 END
 
+IDR_PROP_EDIT_MENU MENU
+BEGIN
+    POPUP "&Select Prop"
+    BEGIN
+        MENUITEM "PlaceHolder",                 ID_SELECTSHIP_PLACEHOLDER
+    END
+END
+
 IDR_PLAYER_EDIT_MENU MENU
 BEGIN
     POPUP "Select Team"
@@ -622,6 +630,7 @@ BEGIN
     "F",            ID_EDITORS_FICTION,     VIRTKEY, SHIFT, NOINVERT
     "G",            ID_EDITORS_GOALS,       VIRTKEY, SHIFT, NOINVERT
     "G",            ID_VIEW_GRID,           VIRTKEY, SHIFT, ALT, NOINVERT
+    "P",            ID_EDITORS_PROPS,       VIRTKEY, SHIFT, CONTROL, NOINVERT
     "H",            ID_ERROR_CHECKER,       VIRTKEY, SHIFT, NOINVERT
     "H",            ID_SELECT_LIST,         VIRTKEY, NOINVERT
     "H",            ID_SHOW_HORIZON,        VIRTKEY, SHIFT, ALT, NOINVERT
@@ -1089,6 +1098,20 @@ BEGIN
     EDITTEXT        IDC_HELP_BOX,7,421,308,78,ES_MULTILINE | ES_READONLY,WS_EX_TRANSPARENT
 END
 
+IDD_PROP_EDITOR DIALOGEX 0, 0, 300, 200
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+CAPTION "Prop Editor"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    LTEXT           "Name",IDC_STATIC,7,12,24,8
+    EDITTEXT        IDC_PROP_NAME,32,10,90,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Prev",IDC_PROP_PREV,130,10,20,14
+    PUSHBUTTON      "Next",IDC_PROP_NEXT,155,10,20,14
+    LTEXT           "Flags",IDC_STATIC,7,35,30,8
+    LISTBOX         IDC_PROP_FLAGS,7,45,220,60,LBS_MULTIPLESEL | LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+END
+
+
 IDD_WEAPON_EDITOR DIALOGEX 0, 0, 564, 79
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Weapon Editor"
@@ -2624,6 +2647,13 @@ BEGIN
         TOPMARGIN, 7
     END
 
+    IDD_PROP_EDITOR, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 315
+        TOPMARGIN, 7
+    END
+
     IDD_WEAPON_EDITOR, DIALOG
     BEGIN
         LEFTMARGIN, 7
@@ -3274,6 +3304,11 @@ BEGIN
     0
 END
 
+IDD_PROP_EDITOR AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 IDD_WING_EDITOR AFX_DIALOG_LAYOUT
 BEGIN
     0

fred2/fredview.cpp

@@ -31,6 +31,7 @@
 #include "ai/ai.h"
 #include "ai/aigoals.h"
 #include "ship/ship.h"	// for ship names
+#include "prop/prop.h" // for prop names
 #include "MissionGoalsDlg.h"
 #include "MissionCutscenesDlg.h"
 #include "wing.h"
@@ -149,6 +150,7 @@ BEGIN_MESSAGE_MAP(CFREDView, CView)
 	ON_UPDATE_COMMAND_UI(ID_SHOW_WAYPOINTS, OnUpdateViewWaypoints)
 	ON_WM_LBUTTONDOWN()
 	ON_COMMAND(ID_EDITORS_SHIPS, OnEditorsShips)
+	ON_COMMAND(ID_EDITORS_PROPS, OnEditorsProps)
 	ON_WM_KEYDOWN()
 	ON_WM_KEYUP()
 	ON_WM_SETFOCUS()
@@ -1195,6 +1197,18 @@ void CFREDView::OnEditorsShips()
 	Ship_editor_dialog.ShowWindow(SW_RESTORE);
 }
 
+void CFREDView::OnEditorsProps()
+{
+	Assert(Prop_editor_dialog.GetSafeHwnd());
+
+	if (!theApp.init_window(&Prop_wnd_data, &Prop_editor_dialog, 0))
+		return;
+
+	Prop_editor_dialog.SetWindowPos(&wndTop, 0, 0, 0, 0,
+		SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
+	Prop_editor_dialog.ShowWindow(SW_RESTORE);
+}
+
 void CFREDView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT lParam)
 {
 	uint lKeyData;
@@ -1460,10 +1474,14 @@ void CFREDView::OnContextMenu(CWnd* /*pWnd*/, CPoint point)
 			else {
 				CString str;
 
-				if ((Objects[objnum].type == OBJ_START) || (Objects[objnum].type == OBJ_SHIP))
+				if ((Objects[objnum].type == OBJ_START) || (Objects[objnum].type == OBJ_SHIP)) {
 					str.Format("Edit %s", Ships[Objects[objnum].instance].ship_name);
 
-				else if (Objects[objnum].type == OBJ_JUMP_NODE) {
+				} else if (Objects[objnum].type == OBJ_PROP) {
+					id = ID_EDITORS_PROPS;
+					str.Format("Edit %s", Props[Objects[objnum].instance].prop_name);
+
+				} else if (Objects[objnum].type == OBJ_JUMP_NODE) {
 					auto jnp = jumpnode_get_by_objnum(objnum);
 					Assert(jnp != nullptr);
 
@@ -2001,6 +2019,10 @@ void CFREDView::OnLButtonDblClk(UINT nFlags, CPoint point)
 				OnEditorsShips();
 				break;
 
+			case OBJ_PROP:
+				OnEditorsProps();
+				break;
+
 			case OBJ_WAYPOINT:
 				OnEditorsWaypoint();
 				break;

fred2/fredview.h

@@ -105,6 +105,7 @@ class CFREDView : public CView
 	afx_msg void OnUpdateViewWaypoints(CCmdUI* pCmdUI);
 	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
 	afx_msg void OnEditorsShips();
+	afx_msg void OnEditorsProps();
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnSetFocus(CWnd* pOldWnd);