From fdcf70b713358bf3e7c4aea9bc6e444d66557839 Mon Sep 17 00:00:00 2001
From: IndigoFox <indigo@indigofox.dev>
Date: Mon, 12 Feb 2024 19:32:19 -0800
Subject: [PATCH] revert CfgFunctions to nested include

---
 description.ext            |   4 +-
 framework/CfgFunctions.hpp | 309 ++++++++++++++++++-------------------
 2 files changed, 156 insertions(+), 157 deletions(-)

diff --git a/description.ext b/description.ext
index b23393f..fa93c9e 100644
--- a/description.ext
+++ b/description.ext
@@ -95,7 +95,9 @@ class Params
 
 
 // CfgFunctions
-#include "framework\CfgFunctions.hpp"
+class CfgFunctions {
+	#include "framework\CfgFunctions.hpp"
+};
 
 
 
diff --git a/framework/CfgFunctions.hpp b/framework/CfgFunctions.hpp
index bfe7d28..2a3c4a0 100644
--- a/framework/CfgFunctions.hpp
+++ b/framework/CfgFunctions.hpp
@@ -1,180 +1,177 @@
 #include "script_mod.hpp"
 
-class CfgFunctions {
-
-	class DOUBLES(PREFIX,init) {
-		class functions {
-			file = "framework\init\functions";
-			class initServer { postInit = 1;};
-			class initClient { postInit = 1;};
-			class setDefaults { postInit = 1; };
-			class addAARChatHandler { postInit = 1; };
-			class addRespawnChatHandler { postInit = 1; };
-		};
+class DOUBLES(PREFIX,init) {
+	class functions {
+		file = "framework\init\functions";
+		class initServer { postInit = 1;};
+		class initClient { postInit = 1;};
+		class setDefaults { postInit = 1; };
+		class addAARChatHandler { postInit = 1; };
+		class addRespawnChatHandler { postInit = 1; };
 	};
-	
-	class PREFIX {	
-		class ambience {
-			file = "framework\ambience";
-			class flakInitVehicle {};
-			class flakEH {};
-		};
+};
+
+class PREFIX {	
+	class ambience {
+		file = "framework\ambience";
+		class flakInitVehicle {};
+		class flakEH {};
 	};
+};
 
-	class DOUBLES(PREFIX,client) {
-		class functions {
-			file = "framework\client\functions";
-			class bindEmptyGroupGarbageCleanup { postInit = 1; };
-			class bindEventHandlers { postInit = 1; };
-			class bindVehicleActions { postInit = 1; };
-			class addZenModules {postInit = 1;};
-		};
+class DOUBLES(PREFIX,client) {
+	class functions {
+		file = "framework\client\functions";
+		class bindEmptyGroupGarbageCleanup { postInit = 1; };
+		class bindEventHandlers { postInit = 1; };
+		class bindVehicleActions { postInit = 1; };
+		class addZenModules {postInit = 1;};
 	};
+};
 
-	class DOUBLES(PREFIX,common) {
-		class functions {
-			file = "framework\common\functions";
-			class addCBASettings { preInit = 1; };
-			class logMissionInfo {};
-			class addPlayerInfoToArray {};
-			class createOrUpdateDiaryRecord {};
-			class getApprovedAssetsCfg {};
-			class getBattalionCfg {};
-			class getNameOfBase {};
-			class getNearestBase {};
-			class log {};
-			class checkPlayerInventory {};
-			class logSettingChanged {};
-			class padString {};
-			class recurseSubclasses {};
-		};
+class DOUBLES(PREFIX,common) {
+	class functions {
+		file = "framework\common\functions";
+		class addCBASettings { preInit = 1; };
+		class logMissionInfo {};
+		class addPlayerInfoToArray {};
+		class createOrUpdateDiaryRecord {};
+		class getApprovedAssetsCfg {};
+		class getBattalionCfg {};
+		class getNameOfBase {};
+		class getNearestBase {};
+		class log {};
+		class checkPlayerInventory {};
+		class logSettingChanged {};
+		class padString {};
+		class recurseSubclasses {};
 	};
+};
 
-	class DOUBLES(PREFIX,fbcb2_assets) {
-		class functions {
-			file = "framework\fbcb2_assets\functions";
-			class addCBASettings {preInit=1;};
-			class initServer {};
-			class initClient {};
-			class getCallsignFromClassname {};
-			class getCurrentAssetsByBase {};
-			class getInventory {};
-			class getMagsForWeapon {};
-			class getStartingAndCurrentAssets {};
-			class getStartingAssetsByBase {};
-			class getVehicleData {};
-			class getWeaponry {};
-			class hintAllApprovedAssets {};
-			class isAssetInRangeOfBase {};
-			class removeAssetDiaryRecords {};
-			class removeMarkersOnMap {};
-			class showMarkersOnMap {};
-			class updateAssetDiary {};
-			class updateAssetsByBase {};
-		};
+class DOUBLES(PREFIX,fbcb2_assets) {
+	class functions {
+		file = "framework\fbcb2_assets\functions";
+		class addCBASettings {preInit=1;};
+		class initServer {};
+		class initClient {};
+		class getCallsignFromClassname {};
+		class getCurrentAssetsByBase {};
+		class getInventory {};
+		class getMagsForWeapon {};
+		class getStartingAndCurrentAssets {};
+		class getStartingAssetsByBase {};
+		class getVehicleData {};
+		class getWeaponry {};
+		class hintAllApprovedAssets {};
+		class isAssetInRangeOfBase {};
+		class removeAssetDiaryRecords {};
+		class removeMarkersOnMap {};
+		class showMarkersOnMap {};
+		class updateAssetDiary {};
+		class updateAssetsByBase {};
 	};
+};
 
-	class DOUBLES(PREFIX,fbcb2_main) {
-		class functions {
-			file = "framework\fbcb2_main\functions";
-			class initClient {};
-			class addEnvironmentRecord {};
-			class addFrequenciesRecord {};
-			class addSignalColorsRecord {};
-		};
-		class util {
-			file = "framework\fbcb2_main\util";
-			class formatRadioElementForDiary {};
-			class generateElementFrequencyRecordText {};
-		};
+class DOUBLES(PREFIX,fbcb2_main) {
+	class functions {
+		file = "framework\fbcb2_main\functions";
+		class initClient {};
+		class addEnvironmentRecord {};
+		class addFrequenciesRecord {};
+		class addSignalColorsRecord {};
 	};
-
-	class DOUBLES(PREFIX,mapcopy) {
-		class functions {
-			file = "framework\mapcopy\functions";
-			class addCBASettings {preInit=1;};
-			class initClient {};
-			class getMapMarkers {};
-			class loadMapMarkers {};
-			class mapMarkerToString {};
-			class stringToMapMarker {};
-		};
+	class util {
+		file = "framework\fbcb2_main\util";
+		class formatRadioElementForDiary {};
+		class generateElementFrequencyRecordText {};
 	};
+};
 
-	class DOUBLES(PREFIX,performance) {
-		class functions {
-			file = "framework\performance\functions";
-			class addCBASettings {preInit=1;};
-			class addDNI_PlayerFPS { postInit = 1; };
-
-			// PFHs managed in addCBASettings onChange code
-			class addClientStatsPFH {};
-			class calculateClientStats {};
-			class addServerStatsPFH {};
-			class calculateServerStats {};
-		};
+class DOUBLES(PREFIX,mapcopy) {
+	class functions {
+		file = "framework\mapcopy\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class getMapMarkers {};
+		class loadMapMarkers {};
+		class mapMarkerToString {};
+		class stringToMapMarker {};
 	};
+};
 
-	class DOUBLES(PREFIX,reinsert) {
-		class functions {
-			file = "framework\reinsert\functions";
-			class addCBASettings {preInit=1;};
-		};
-		class server {
-			file = "framework\reinsert\server";
-			class initServer {};
-			class addToQueue {};
-			class globalShowQueue {};
-			class removeFromQueue {};
-			class returnReinsertQueueNotification {};
-			class validateQueue {};
-		};
-		class client {
-			file = "framework\reinsert\client";
-			class initClient {};
-			class addAceSelfActions {};
-			class addCheckQueueSelfAction {};
-			class requestShowQueue {};
-		};
+class DOUBLES(PREFIX,performance) {
+	class functions {
+		file = "framework\performance\functions";
+		class addCBASettings {preInit=1;};
+		class addDNI_PlayerFPS { postInit = 1; };
+
+		// PFHs managed in addCBASettings onChange code
+		class addClientStatsPFH {};
+		class calculateClientStats {};
+		class addServerStatsPFH {};
+		class calculateServerStats {};
 	};
+};
 
-	class DOUBLES(PREFIX,resupply) {
-		class functions {
-			file = "framework\resupply\functions";
-			class addCBASettings {preInit=1;};
-			class initClient {};
-			class createBox {};
-			class getSupplyCratesCfg {};
-			class addArsenalObjectSpawnBoxActions {};
-		};
+class DOUBLES(PREFIX,reinsert) {
+	class functions {
+		file = "framework\reinsert\functions";
+		class addCBASettings {preInit=1;};
 	};
-
-	class DOUBLES(PREFIX,triageIcons) {
-		class functions {
-			file = "framework\triageIcons\functions";
-			class addCBASettings {preInit=1;};
-			class initClient {};
-			class addDrawIconsPFH {};
-			class addGetEntitiesPFH {};
-			class updateColors {};
-		};
+	class server {
+		file = "framework\reinsert\server";
+		class initServer {};
+		class addToQueue {};
+		class globalShowQueue {};
+		class removeFromQueue {};
+		class returnReinsertQueueNotification {};
+		class validateQueue {};
 	};
-
-	class DOUBLES(PREFIX,vehicleFlags) {
-		class functions {
-			file = "framework\vehicleFlags\functions";
-			class initClient {};
-			class getActionsFlagCategories {};
-			class getVehicleFlagsCfg {};
-			class isClassExcluded {};
-		};
+	class client {
+		file = "framework\reinsert\client";
+		class initClient {};
+		class addAceSelfActions {};
+		class addCheckQueueSelfAction {};
+		class requestShowQueue {};
 	};
+};
 
-	class DOUBLES(PREFIX,zeus) {
-		class functions {
-			file = "framework\zeus\functions";
-			class initClient {};
-			class addZenModules {};
-		};
+class DOUBLES(PREFIX,resupply) {
+	class functions {
+		file = "framework\resupply\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class createBox {};
+		class getSupplyCratesCfg {};
+		class addArsenalObjectSpawnBoxActions {};
+	};
+};
+
+class DOUBLES(PREFIX,triageIcons) {
+	class functions {
+		file = "framework\triageIcons\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class addDrawIconsPFH {};
+		class addGetEntitiesPFH {};
+		class updateColors {};
+	};
+};
+
+class DOUBLES(PREFIX,vehicleFlags) {
+	class functions {
+		file = "framework\vehicleFlags\functions";
+		class initClient {};
+		class getActionsFlagCategories {};
+		class getVehicleFlagsCfg {};
+		class isClassExcluded {};
+	};
+};
+
+class DOUBLES(PREFIX,zeus) {
+	class functions {
+		file = "framework\zeus\functions";
+		class initClient {};
+		class addZenModules {};
 	};
 };
\ No newline at end of file