handle include FGD method (fixes #112)

also keep classes in alphabetical order within the groups, and don't crash on invalid FGD methods.

src/editor/Fgd.cpp

@@ -2,6 +2,8 @@
 #include "util.h"
 #include <set>
 #include <fstream>
+#include "globals.h"
+#include <algorithm>
 
 map<string, int> fgdKeyTypes{
 	{"integer", FGD_KEY_INTEGER},
@@ -49,6 +51,8 @@ void Fgd::merge(Fgd* other) {
 		classes.push_back(newClass);
 		classMap[className] = newClass;
 	}
+
+	sortClasses();
 }
 
 bool Fgd::parse() {
@@ -82,6 +86,24 @@ bool Fgd::parse() {
 		if (line.empty())
 			continue;
 
+		if (line.find("@include") == 0) {
+			string baseFgd = getValueInQuotes(line.substr(8));
+			string basePath = path.substr(0, path.find_last_of("/\\") + 1) + baseFgd;
+
+			if (g_parsed_fgds.count(basePath)) {
+				continue;
+			}
+			g_parsed_fgds.insert(basePath);
+
+			Fgd* tmp = new Fgd(basePath);
+			if (tmp->parse()) {
+				merge(tmp);
+			}
+
+			delete tmp;
+			continue;
+		}
+
 		if (line[0] == '@') {
 			if (bracketNestLevel) {
 				logf("ERROR: New FGD class definition starts before previous one ends (line %d)\n", lineNum);
@@ -122,6 +144,7 @@ bool Fgd::parse() {
 	processClassInheritance();
 	createEntGroups();
 	setSpawnflagNames();
+	sortClasses();
 	return true;
 }
 
@@ -145,6 +168,7 @@ void Fgd::parseClassHeader(FgdClass& fgdClass) {
 	}
 	else {
 		logf("ERROR: Unrecognized FGD class type '%s'\n", typeParts[0].c_str());
+		return;
 	}
 
 	// parse constructors/properties
@@ -558,3 +582,14 @@ vector<string> Fgd::splitStringIgnoringQuotes(string s, string delimitter) {
 
 	return split;
 }
+
+bool sortFgdClasses(FgdClass* a, FgdClass* b) { return a->name < b->name; }
+
+void Fgd::sortClasses() {
+	for (int i = 0; i < solidEntGroups.size(); i++) {
+		std::sort(solidEntGroups[i].classes.begin(), solidEntGroups[i].classes.end(), sortFgdClasses);
+	}
+	for (int i = 0; i < pointEntGroups.size(); i++) {
+		std::sort(pointEntGroups[i].classes.begin(), pointEntGroups[i].classes.end(), sortFgdClasses);
+	}
+}

src/editor/Fgd.h

@@ -139,4 +139,6 @@ class Fgd {
 	string getValueInQuotes(string s);
 
 	vector<string> splitStringIgnoringQuotes(string s, string delimitter);
+
+	void sortClasses();
 };

src/editor/Renderer.cpp

@@ -605,7 +605,13 @@ void Renderer::loadSettings() {
 
 void Renderer::loadFgds() {
 	Fgd* mergedFgd = NULL;
+
 	for (int i = 0; i < g_settings.fgdPaths.size(); i++) {
+		string path = g_settings.fgdPaths[i];
+
+		g_parsed_fgds.clear();
+		g_parsed_fgds.insert(path);
+
 		Fgd* tmp = new Fgd(g_settings.fgdPaths[i]);
 		if (!tmp->parse())
 		{

src/globals.cpp

@@ -12,6 +12,7 @@ AppSettings g_settings;
 string g_config_dir = getConfigDir();
 string g_settings_path = g_config_dir + "bspguy.cfg";
 Renderer* g_app = NULL;
+std::set<std::string> g_parsed_fgds;
 
 MapLimits g_limits;
 MapLimits g_engine_limits[ENGINE_TYPES];

src/globals.h

@@ -3,6 +3,7 @@
 #include <vector>
 #include <string>
 #include <mutex>
+#include <set>
 #include "AppSettings.h"
 
 enum engine_types {
@@ -51,4 +52,7 @@ extern MapLimits g_engine_limits[ENGINE_TYPES];
 extern std::string g_config_dir;
 extern std::string g_settings_path;
 
+// prevents infinite include loops
+extern std::set<std::string> g_parsed_fgds;
+
 extern int g_render_flags;