Merge pull request #1296 from The-E/RestoreFlagWindows

Restore the flag viewers

Author: niffiwan

code/lab/lab.cpp

@@ -1363,30 +1363,33 @@ void labviewer_set_class_window(int mode)
 
 
 // ------------------------------  Flags Window --------------------------------
-typedef struct lab_flag {
-	Checkbox *cb;
-	int flag;
-	bool second;
-} lab_flag;
+template<class T>
+struct lab_flag {
+	Checkbox* cb;
+	T flag;
+};
 
-static SCP_vector<lab_flag> Lab_flags;
+static SCP_vector<lab_flag<Ship::Info_Flags>> Ship_Class_Flags;
+static SCP_vector<lab_flag<Weapon::Info_Flags>> Weapon_Class_Flags;
 
 void labviewer_flags_clear()
 {
 	if (Lab_flags_window != NULL) {
 		Lab_flags_window->DeleteChildren();
 	}
-
-	Lab_flags.clear();
+	
+	Ship_Class_Flags.clear();
+	Weapon_Class_Flags.clear();
 }
 
-void labviewer_flags_add(int *X, int *Y, char *flag_name, int flag, bool flags2 = false)
+template <class T>
+void labviewer_flags_add(int* X, int* Y, const char *flag_name, T flag, SCP_vector<lab_flag<T>>& flag_list) 
 {
 	int x = 0, y = 0;
 
-	Assert( (Lab_flags_window != NULL) && (flag_name != NULL) );
+	Assert((Lab_flags_window != NULL) && (flag_name != NULL));
 
-	lab_flag new_flag;
+	lab_flag<T> new_flag;
 
 	if (X) {
 		x = *X;
@@ -1396,11 +1399,9 @@ void labviewer_flags_add(int *X, int *Y, char *flag_name, int flag, bool flags2
 		y = *Y;
 	}
 
-	new_flag.cb = (Checkbox*) Lab_flags_window->AddChild(new Checkbox(flag_name, x, y));
+	new_flag.cb = (Checkbox*)Lab_flags_window->AddChild(new Checkbox(flag_name, x, y));
 	new_flag.flag = flag;
-	new_flag.second = flags2;
-
-	Lab_flags.push_back( new_flag );
+	flag_list.push_back(new_flag);
 
 	if (X) {
 		*X += new_flag.cb->GetWidth() + 2;
@@ -1424,13 +1425,21 @@ void labviewer_populate_flags_window()
 	// clear out anything that already exists
 	labviewer_flags_clear();
 
+	int y = 0;
+
     // ship flags ...
     if (Lab_mode == LAB_MODE_SHIP) {
-        //Needs reimplementation
+		for (size_t i = 0; i < Num_ship_flags; ++i) 
+		{
+			labviewer_flags_add<Ship::Info_Flags>(nullptr, &y, Ship_flags[i].name, Ship_flags[i].def, Ship_Class_Flags);
+		}
     }
     // weapon flags ...
     else if (Lab_mode == LAB_MODE_WEAPON) {
-        //Needs reimplementation
+		for (size_t i = 0; i < num_weapon_info_flags; ++i)
+		{
+			labviewer_flags_add<Weapon::Info_Flags>(nullptr, &y, Weapon_Info_Flags[i].name, Weapon_Info_Flags[i].def, Weapon_Class_Flags);
+		}
     }
 }
 
@@ -1439,26 +1448,33 @@ void labviewer_update_flags_window()
 	if ( (Lab_selected_index < 0) || (Lab_mode == LAB_MODE_NONE) ) {
 		return;
 	}
-
-	// no flags? then don't bother
-	if (Lab_flags.empty()) {
-		return;
-	}
-
-
+	
     if (Lab_mode == LAB_MODE_SHIP) {
-        //Needs reimplementation
+		auto sip = &Ship_info[Lab_selected_index];
+
+		for (auto flag_def : Ship_Class_Flags) 
+		{
+			if (flag_def.flag == Ship::Info_Flags::NUM_VALUES) continue;
+			flag_def.cb->SetFlag(sip->flags, flag_def.flag, sip);
+		}
     }
     else if (Lab_mode == LAB_MODE_WEAPON) {
-        //Needs reimplementation
+		auto wip = &Weapon_info[Lab_selected_index];
+
+		for (auto flag_def : Weapon_Class_Flags)
+		{
+			if (flag_def.flag == Weapon::Info_Flags::NUM_VALUES) continue;
+			flag_def.cb->SetFlag(wip->wi_flags, flag_def.flag, wip);
+		}
     }
 }
 
 void labviewer_close_flags_window(GUIObject *caller)
 {
 	Lab_flags_window = NULL;
 
-	Lab_flags.clear();
+	Ship_Class_Flags.empty();
+	Weapon_Class_Flags.empty();
 }
 
 void labviewer_make_flags_window(Button *caller)

code/lab/wmcgui.cpp

@@ -2475,9 +2475,19 @@ int Checkbox::DoMouseUp(float frametime)
 				*FlagPtr &= ~Flag;
 				IsChecked = false;
 			}
-		} else if (BoolFlagPtr != NULL) {
+		}
+		else if (BoolFlagPtr != NULL) {
 			*BoolFlagPtr = !(*BoolFlagPtr);
 			IsChecked = *BoolFlagPtr;
+		}
+		else if (Sip != nullptr)
+		{
+			Sip->flags.toggle(static_cast<Ship::Info_Flags>(Flag));
+			IsChecked = Sip->flags[static_cast<Ship::Info_Flags>(Flag)];
+		} else if (Wip != nullptr) 
+		{
+			Wip->wi_flags.toggle(static_cast<Weapon::Info_Flags>(Flag));
+			IsChecked = Wip->wi_flags[static_cast<Weapon::Info_Flags>(Flag)];
 		} else {
 			IsChecked = !IsChecked;
 		}

code/lab/wmcgui.h

@@ -13,6 +13,8 @@
 #include "globalincs/linklist.h"
 #include "globalincs/pstypes.h"
 #include "io/mouse.h"
+#include "ship/ship.h"
+#include "weapon/weapon.h"
 
 #include <string>
 #include <limits.h>
@@ -622,7 +624,10 @@ class Checkbox : public GUIObject
 
 	//For toggling flags with this thing
 	int* FlagPtr;
-	int Flag;
+	size_t Flag;
+
+	ship_info* Sip;
+	weapon_info* Wip;
 
 	bool *BoolFlagPtr;
 
@@ -667,6 +672,20 @@ class Checkbox : public GUIObject
 		SetFlag((int*)in_flag_ptr, in_flag);
 	}
 
+	void SetFlag(flagset<Ship::Info_Flags>& in_flag_set, Ship::Info_Flags flag_value, ship_info* si) {
+		FlagPtr = nullptr;
+		Sip = si;
+		Flag = static_cast<size_t>(flag_value);
+		IsChecked = in_flag_set[flag_value];
+	}
+
+	void SetFlag(flagset<Weapon::Info_Flags>& in_flag_set, Weapon::Info_Flags flag_value, weapon_info* wi) {
+		FlagPtr = nullptr;
+		Wip = wi;
+		Flag = static_cast<size_t>(flag_value);
+		IsChecked = in_flag_set[flag_value];
+	}
+
 	void SetBool(bool *in_bool_ptr) {
 		BoolFlagPtr = in_bool_ptr;
 	}

code/ship/ship.h

@@ -1243,6 +1243,9 @@ class ship_info
 	const ship_info &operator=(const ship_info& other);
 };
 
+extern flag_def_list_new<Ship::Info_Flags> Ship_flags[];
+extern const size_t Num_ship_flags;
+
 extern int Num_wings;
 extern ship Ships[MAX_SHIPS];
 extern ship	*Player_ship;

code/weapon/weapon.h

@@ -467,6 +467,9 @@ typedef struct weapon_info {
 	void reset();
 } weapon_info;
 
+extern flag_def_list_new<Weapon::Info_Flags> Weapon_Info_Flags[];
+extern const size_t num_weapon_info_flags;
+
 // Data structure to track the active missiles
 typedef struct missile_obj {
 	missile_obj *next, *prev;