From 6fb4290ffe472af52c61b44fd81236d91c25ffe9 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Wed, 9 Nov 2016 12:33:11 -0500 Subject: [PATCH] Remove unused compile Vanilla commit: https://github.com/DayZMod/DayZ/commit/4a18d5023dab59983ae0326b112801e26d4bc547 --- .../compile/object_infectedcamps.sqf | 43 ------------------- SQF/dayz_code/init/compiles.sqf | 2 - SQF/dayz_code/init/publicEH.sqf | 1 - SQF/dayz_code/init/variables.sqf | 1 - SQF/dayz_code/system/player_monitor.fsm | 5 --- 5 files changed, 52 deletions(-) delete mode 100644 SQF/dayz_code/compile/object_infectedcamps.sqf diff --git a/SQF/dayz_code/compile/object_infectedcamps.sqf b/SQF/dayz_code/compile/object_infectedcamps.sqf deleted file mode 100644 index 15b90c4ea..000000000 --- a/SQF/dayz_code/compile/object_infectedcamps.sqf +++ /dev/null @@ -1,43 +0,0 @@ -/* - Created exclusively for ArmA2:OA - DayZMod. - Please request permission to use/alter from R4Z0R49. -*/ - -//"Infected Camps: [[[7020.76,4072.34,0],40],[[10066.8,12114.3,0],20],[[10033.4,12525,0],20],[[9125.71,7742.72,0],40],[[6057.93,2655.66,0],40]]" -//Server_InfectedCamps, [[[_basePos],_amount,_radius]] - -//diag_log(str(__FILE__)); - -private ["_markerstr","_counter","_camp","_campName","_campPos","_campAmount","_campRadius","_trigger","_trgcode","_array"]; -_array = _this; -_counter = 0; - -{ - _counter = _counter + 1; - _camp = _x; - _campName = format["BaseCamp_%1",_counter]; -//diag_log ("Camp: " +str(_x)); - _campPos = _camp select 0; -//diag_log ("CampPos: " +str(_campPos)); - _campAmount = _camp select 1; -//diag_log ("CampAmont: " +str(_campAmount)); - _campRadius = _camp select 2; -//diag_log ("CampRadius: " +str(_campRadius)); -/* - _trigger = createTrigger["EmptyDetector",_campPos]; - _trigger setTriggerArea[_campRadius,_campRadius+100,false]; - _trigger setTriggerActivation["ANY","PRESENT",false]; - _trgcode = format["[%1,%2] call camp_spawnZombies;",_campPos,_campAmount]; - _trigger setTriggerStatements["player in thislist", _trgcode, ""]; - //_trigger setTriggerTimeout [0, 5, 3, false]; -*/ - - if ("ItemMap_Debug" in items player) then { - _markerstr = createMarker [_campName,_campPos]; - _markerstr setMarkerColor "ColorRed"; - _markerstr setMarkerShape "ELLIPSE"; - _markerstr setMarkerBrush "Border"; - _markerstr setMarkerSizeLocal [_campRadius, _campRadius]; - }; - -} foreach _array; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 102bf72e8..178e7f8a7 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -145,8 +145,6 @@ if (!isDedicated) then { //System player_spawn_2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_spawn_2.sqf"; - infectedcamps = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_infectedcamps.sqf"; - //camp_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\camp_spawnZombies.sqf"; //Server compile, used for loiter behaviour //Crafting fn_updateCraftUI = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_updateCraftUI.sqf"; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index c70d4fc0f..44d971e40 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -10,7 +10,6 @@ "PVCDZ_veh_SetFuel" addPublicVariableEventHandler {(_this select 1) spawn local_setFuel}; "PVCDZ_veh_engineSwitch" addPublicVariableEventHandler {(_this select 1) spawn dayz_engineSwitch}; "PVCDZ_OpenTarget_Reset" addPublicVariableEventHandler { OpenTarget_Time = diag_tickTime; }; //reset OpenTarget timer -//"dayzInfectedCamps" addPublicVariableEventHandler {(_this select 1) call infectedcamps}; // EPOCH ADDITIONS "PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) call local_lockUnlock}; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e079adfd7..a00785f78 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -572,7 +572,6 @@ TimeOutDisplayed = false; if (isServer) then { dead_bodyCleanup = []; needUpdate_objects = []; - Server_InfectedCamps = []; //dayz_spawnCrashSite_clutterCutter=0; // helicrash spawn... 0: loot hidden in grass, 1: loot lifted, 2: no grass //dayz_spawnInfectedSite_clutterCutter=0; // infected base spawn... 0: loot hidden in grass, 1: loot lifted, 2: no grass //Objects to remove when killed. diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 99b906181..18a96d898 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1134,11 +1134,6 @@ class FSM name = "Initialize"; itemno = 31; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Initialize'];};" \n - "" \n - "if (!isNil ""dayzInfectedCamps"") then {" \n - " //diag_log (""Infected Camps: "" +str(dayzInfectedCamps));" \n - " dayzInfectedCamps call infectedcamps;" \n - "};" \n "" \n "//Medical" \n "dayz_medicalH = [] execVM ""\z\addons\dayz_code\medical\init_medical.sqf""; //Medical Monitor Script (client only)" \n