ready for dedi -- improvements to resupply, triageIcons too

framework/init/functions/fn_addAARChatHandler.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 [
 	"saveaar", 
 	{

framework/init/functions/fn_initClient.sqf

@@ -0,0 +1,34 @@
+#include "..\script_component.hpp"
+
+if ( !hasInterface ) exitWith {};
+
+["milsim_logText", {
+	params [["_strArray", [""], [[]]]];
+	{
+		diag_log text _x;
+	} forEach _strArray;
+}] call CBA_fnc_addEventHandler;
+
+// make sure the server has finished init
+waitUntil {!isNil QGVARMAIN(complete)};
+
+["InitializePlayer", [player, true]] call BIS_fnc_dynamicGroups;
+
+
+// initialize other modules
+call EFUNC(reinsert,initClient);
+call EFUNC(resupply,initClient);
+call EFUNC(triageIcons,initClient);
+call EFUNC(vehicleFlags,initClient);
+call EFUNC(fbcb2_main,initClient);
+call EFUNC(fbcb2_assets,initClient);
+
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"postInit complete",
+	[]
+] call EFUNC(common,log);
+
+nil;

framework/init/functions/fn_initPlayerLocal.sqf

@@ -1,23 +0,0 @@
-#include "..\script_component.hpp"
-
-if ( !hasInterface ) exitWith {};
-
-if (!isServer) then {
-	["milsim_logText", {
-		params [["_strArray", [""], [[]]]];
-		{
-			diag_log text _x;
-		} forEach _strArray;
-	}] call CBA_fnc_addEventHandler;
-};
-
-["InitializePlayer", [player, true]] call BIS_fnc_dynamicGroups;
-
-[
-	LEVEL_DEBUG,
-	QUOTE(COMPONENT),
-	"postInit complete",
-	[]
-] call EFUNC(common,log);
-
-nil;

framework/init/functions/fn_initServer.sqf

@@ -2,23 +2,30 @@
 
 if (!isServer) exitWith {};
 
-
 // array of all respawn modules in the mission representing "bases"
 GVARMAIN(baseObjects) = allMissionObjects "ModuleRespawnPosition_F";
-publicVariable "milsim_baseObjects";
+publicVariable QGVARMAIN(baseObjects);
 
 // Initializes the Dynamic Groups framework and groups
 ["Initialize", [true]] call BIS_fnc_dynamicGroups;
 
-["milsim_logText", {
-	params [["_strArray", [""], [[]]]];
-	{
-		diag_log text _x;
-	} forEach _strArray;
-}] call CBA_fnc_addEventHandler;
+if (isDedicated) then {
+	["milsim_logText", {
+		params [["_strArray", [""], [[]]]];
+		{
+			diag_log text _x;
+		} forEach _strArray;
+	}] call CBA_fnc_addEventHandler;
+};
 
-missionNamespace setVariable [QGVARMAIN(complete), true];
-publicVariable QGVARMAIN(complete);
+
+// initialize other modules
+call EFUNC(common,logMissionInfo);
+call EFUNC(fbcb2_assets,initServer);
+call EFUNC(reinsert,initServer);
+
+// declare init complete to other modules
+missionNamespace setVariable [QGVARMAIN(complete), true, true];
 
 [
 	LEVEL_INFO,