restored old system since ace actions fail to initialize

Giallustio · Nov 12, 2015 · 33323af · 33323af
1 parent ab5e675
commit 33323af
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 40 deletions.
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/create.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/create.sqf
@@ -25,7 +25,7 @@ _group spawn btc_fnc_civ_addWP;
 
 _group setSpeedMode "LIMITED";
 
-//{_x call btc_fnc_rep_add_eh} foreach units _group;
+{_x call btc_fnc_civ_unit_create} foreach units _group;
 
 if (BTC_debug_log) then {
 	diag_log format ["BTC_fnc_civ_create: _this = %1 ; POS %2 UNITS N %3",_this,_pos,count units _group];

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/populate.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/populate.sqf
@@ -43,6 +43,6 @@ for "_i" from 0 to _n do
 	_group = createGroup civilian;
 	_group createUnit [_unit_type, getPos _house, [], 0, "NONE"];
 	_group spawn btc_fnc_civ_addWP;
-	//{_x call BTC_fnc_rep_add_eh} foreach units _group;
+	{_x call btc_fnc_civ_unit_create} foreach units _group;
 	_houses = _houses - [_house];
 };
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/traffic_create.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/traffic_create.sqf
@@ -47,6 +47,6 @@ _3 = _veh addEventHandler ["GetOut", {_this call btc_fnc_civ_traffic_eh}];
 _veh setVariable ["eh", [_1,_2,_3/*,4,5*/]];
 _veh setVariable ["driver", leader _group];
 
-{/*_x call btc_fnc_rep_add_eh;*/_x setVariable ["traffic",_veh];} foreach units _group;
+{_x call btc_fnc_civ_unit_create;_x setVariable ["traffic",_veh];} foreach units _group;
 
 [_group,_area] call btc_fnc_civ_traffic_add_WP;
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/compile.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/compile.sqf
@@ -111,7 +111,7 @@ if (isServer) then {
 btc_fnc_db_add_veh = compile preprocessFile "core\fnc\db\add_veh.sqf";
 
 //EH
-//btc_fnc_eh_unit_init = compile preprocessFile "core\fnc\eh\unit_init.sqf";
+btc_fnc_eh_unit_init = compile preprocessFile "core\fnc\eh\unit_init.sqf";
 
 //INT
 btc_fnc_int_change_var = compile preprocessFile "core\fnc\int\change_var.sqf";

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/data/spawn_group.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/data/spawn_group.sqf
@@ -83,4 +83,4 @@ _group setBehaviour (_behaviour select 0);
 _group setCombatMode (_behaviour select 1);
 _group setFormation (_behaviour select 2);
 
-//if (_side == btc_enemy_side) then {{_x spawn btc_fnc_mil_unit_create} foreach units _group;};
+if (_side == btc_enemy_side) then {{_x call btc_fnc_mil_unit_create} foreach units _group;};
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/eh/extended_InitPost_EH.hpp b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/eh/extended_InitPost_EH.hpp
@@ -9,9 +9,9 @@ class Extended_InitPost_EventHandlers {
             init = "_this call btc_fnc_eh_veh_init";
         };
     };
-	class CAManBase {
+	/*class CAManBase {
 		class btc_actions {
 			init = "_this call btc_fnc_eh_unit_init";
 		};
-	};
+	};*/
 };
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/eh/unit_init.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/eh/unit_init.sqf
@@ -10,7 +10,7 @@ diag_log format ["UNIT INIT : %1",[_this,side (_this select 0), _type]];
 switch true do {
 	case (side _unit != west && side _unit != civilian) : {
 
-		if (isServer) then {_unit spawn {sleep 0.5;_this call btc_fnc_mil_unit_create;};};
+		if (isServer) then {_unit call btc_fnc_mil_unit_create;};
 
 		if (!isDedicated) then {
 			if (isNil "btc_actions_units") then {btc_actions_units = [];};
@@ -24,26 +24,24 @@ switch true do {
 	};
 	case (side _unit isEqualTo civilian) : {
 
-		if (isServer) then {_unit spawn {sleep 0.5;_this call btc_fnc_civ_unit_create;};};
+		if (isServer) then {_unit call btc_fnc_civ_unit_create;};
 
 		if (!isDedicated) then {
 			if (isNil "btc_actions_units") then {btc_actions_units = [];};
 			if !(_type in btc_actions_units) then {
 				btc_actions_units pushBack _type;
-
-				_unit spawn {
-					sleep 1;
-					_action = ["Civil_Orders","Civil Orders","",{},{true}] call ace_interact_menu_fnc_createAction;
-					[(typeOf _this), 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;
-					_action = ["Civil_Stop", "Stop", "", {[1,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
-					[(typeOf _this), 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
-					_action = ["Civil_Get_down", "Get down", "", {[2,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
-					[(typeOf _this), 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
-					_action = ["Civil_Go_away", "Go away", "", {[3,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
-					[(typeOf _this), 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
-					_action = ["Ask_Info", "Ask info", "", {[(_this select 0)] spawn btc_fnc_info_ask;}, {Alive (_this select 0) && {side (_this select 0) isEqualTo civilian}}] call ace_interact_menu_fnc_createAction;
-					[(typeOf _this), 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;			
-				};			
+
+				sleep 1;
+				_action = ["Civil_Orders","Civil Orders","",{},{true}] call ace_interact_menu_fnc_createAction;
+				[_type, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;
+				_action = ["Civil_Stop", "Stop", "", {[1,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
+				[_type, 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
+				_action = ["Civil_Get_down", "Get down", "", {[2,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
+				[_type, 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
+				_action = ["Civil_Go_away", "Go away", "", {[3,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
+				[_type, 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;
+				_action = ["Ask_Info", "Ask info", "", {[(_this select 0)] spawn btc_fnc_info_ask;}, {Alive (_this select 0) && {side (_this select 0) isEqualTo civilian}}] call ace_interact_menu_fnc_createAction;
+				[_type, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;			
 			};
 		};
 	};

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/int/add_actions.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/int/add_actions.sqf
@@ -14,8 +14,8 @@ _action = ["request_delete","Delete","",{call btc_fnc_db_request_delete;},{true}
 [player, 1, ["ACE_SelfActions","Database"], _action] call ace_interact_menu_fnc_addActionToObject;
 
 //Intel
-//_action = ["Search_intel", "Search for intel", "", {(_this select 0) spawn btc_fnc_info_search_for_intel;}, {!Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
-//{[_x, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_type_units;
+_action = ["Search_intel", "Search for intel", "", {(_this select 0) spawn btc_fnc_info_search_for_intel;}, {!Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
+{[_x, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_type_units;
 
 //IEDs
 _action = ["Check_IED", "Check for IED", "", {(_this select 0) spawn btc_fnc_ied_check_for;}, {true}] call ace_interact_menu_fnc_createAction;
@@ -69,7 +69,7 @@ _action = ["Civil_Get_down","Get down","",{[2] call btc_fnc_int_orders;},{(vehic
 _action = ["Civil_Go_away","Go away","",{[3] call btc_fnc_int_orders;},{(vehicle player isEqualTo player)}] call ace_interact_menu_fnc_createAction;
 [player, 1, ["ACE_SelfActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToObject;
 
-/*
+
 _action = ["Civil_Orders","Civil Orders","",{},{true}] call ace_interact_menu_fnc_createAction;
 {[_x, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_civ_type_units;
 _action = ["Civil_Stop", "Stop", "", {[1,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
@@ -79,7 +79,7 @@ _action = ["Civil_Get_down", "Get down", "", {[2,(_this select 0)] call btc_fnc_
 _action = ["Civil_Go_away", "Go away", "", {[3,(_this select 0)] call btc_fnc_int_orders;}, {Alive (_this select 0)}] call ace_interact_menu_fnc_createAction;
 {[_x, 0, ["ACE_MainActions","Civil_Orders"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_civ_type_units;
 _action = ["Ask_Info", "Ask info", "", {[(_this select 0)] spawn btc_fnc_info_ask;}, {Alive (_this select 0) && {side (_this select 0) isEqualTo civilian}}] call ace_interact_menu_fnc_createAction;
-{[_x, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_civ_type_units;*/
+{[_x, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToClass;} foreach btc_civ_type_units;
 
 //Re-deploy
 _action = ["fob_redeploy", "Re-deploy", "", {[] spawn btc_fnc_fob_redeploy}, {btc_p_redeploy}, {}, [], [0.4,0,0.4], 5] call ace_interact_menu_fnc_createAction;

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf
@@ -56,7 +56,7 @@ if (!_in_house) then {
 
 if ((position leader _group) distance [0,0,0] < 50) then {{_x setpos _rpos;} foreach units _group;};
 
-//{_x call btc_fnc_mil_unit_create;} foreach units _group;
+{_x call btc_fnc_mil_unit_create;} foreach units _group;
 
 if (btc_debug_log) then {diag_log format ["btc_fnc_mil_create_group: _this = %1 ; POS %2 UNITS N %3",_this,_rpos,count units _group];};	
 

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/create_static.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/create_static.sqf
@@ -17,6 +17,6 @@ _gunner moveInGunner _static;
 _gunner setBehaviour "COMBAT";
 _gunner setCombatMode "RED";
 
-//_gunner call btc_fnc_mil_unit_create;
+_gunner call btc_fnc_mil_unit_create;
 
 if (btc_debug_log) then {diag_log format ["btc_fnc_mil_create_static: _this = %1 ; POS %2 _type %3",_this,_pos,_type];};	
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/patrol_create.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/patrol_create.sqf
@@ -77,4 +77,4 @@ switch (true) do {
 	};
 };
 
-//{_x spawn btc_fnc_mil_unit_create} foreach units _group;
+{_x call btc_fnc_mil_unit_create} foreach units _group;
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/send.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/send.sqf
@@ -53,6 +53,6 @@ switch (_this select 2) do {
 		_wp_3 setWaypointType "SENTRY";
 		_wp setWaypointStatements ["true","(group this) spawn btc_fnc_data_add_group;"];
 
-		//{_x call btc_fnc_mil_unit_create} foreach units _group;
+		{_x call btc_fnc_mil_unit_create} foreach units _group;
 	};
 };
diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/unit_create.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/unit_create.sqf
@@ -1,5 +1,5 @@
 //_this
-diag_log format ["UNIT CREATE - EH ADDED: %1",_this];
+//diag_log format ["UNIT CREATE - EH ADDED: %1",_this];
 if (_this getVariable ["btc_init", false]) exitWith {true};
 
 _this setVariable ["btc_init",true];

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf b/=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf
@@ -68,7 +68,7 @@ _unit setBehaviour "CARELESS";
 _unit setDir (random 360);
 _unit setPosATL _pos;
 _unit setUnitPos "DOWN";
-//{_x call btc_fnc_rep_add_eh} foreach units _group;
+{_x call btc_fnc_civ_unit_create} foreach units _group;
 
 /*
 Author: SENSEI

diff --git a/=BTC=co@22_Hearts_and_Minds.Altis/description.ext b/=BTC=co@22_Hearts_and_Minds.Altis/description.ext
@@ -34,15 +34,8 @@ class RscTitles {
 
 #include "core\sounds\sounds.hpp"
 
-
 #include "core\def\param.hpp"
 
 #include "core\def\functions.hpp"
 
-class Extended_PreInit_EventHandlers {
-    class yourPreInitToDefineFunc {
-        init = "btc_fnc_eh_unit_init = compile preProcessFileLineNumbers 'core\fnc\eh\unit_init.sqf';";
-    };
-};
-
 #include "core\fnc\eh\extended_InitPost_EH.hpp"