From 92b09aa53026fb7cc6bda91b77939451a692e7c7 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Sun, 5 Mar 2017 12:17:09 -0500 Subject: [PATCH] Remove some unused variables Vanilla commit: https://github.com/DayZMod/DayZ/commit/6479708205bccbb4bdd1379a53d9aeed5613f08a --- SQF/dayz_code/compile/fn_selfActions.sqf | 3 --- SQF/dayz_code/init/variables.sqf | 17 +---------------- SQF/dayz_code/medical/setup_functions_med.sqf | 7 ------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 1dd648364..f2f5aa3be 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -1067,9 +1067,6 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur s_player_destroytent = -1; // player removeAction s_player_attach_bomb; // s_player_attach_bomb = -1; - //debug - //player removeAction s_player_debugCheck; - //s_player_debugCheck = -1; player removeAction s_player_upgradestorage; s_player_upgradestorage = -1; /* //Unlock,Lock // Vanilla base building currently not used in Epoch diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 48480a380..4a5ca4f39 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -159,31 +159,22 @@ Dayz_GUI_B = 0.26; // -0.26 a_player_cooking = false; a_player_boil = false; a_player_jerryfilling = false; -a_player_repairing = false; //Player self-action handles dayz_resetSelfActions = { s_player_equip_carry = -1; - s_player_dragbody = -1; s_player_fire = -1; s_player_cook = -1; s_player_boil = -1; s_player_fireout = -1; s_player_packtent = -1; s_player_packtentinfected = -1; - s_player_fillwater = -1; - s_player_fillwater2 = -1; s_player_fillfuel = -1; s_player_grabflare = -1; s_player_removeflare = -1; - s_player_painkiller = -1; s_player_studybody = -1; - s_build_Sandbag1_DZ = -1; - s_build_Hedgehog_DZ = -1; - s_build_Wire_cat1 = -1; s_player_deleteBuild = -1; s_player_flipveh = -1; - s_player_stats = -1; s_player_sleep = -1; s_player_fillfuel210 = -1; s_player_fillfuel20 = -1; @@ -193,7 +184,6 @@ dayz_resetSelfActions = { s_player_fishing = -1; s_player_fishing_veh = -1; s_player_gather = -1; - s_player_debugCheck = -1; s_player_destroytent = -1; s_player_attach_bomb = -1; s_player_upgradestorage = -1; @@ -263,15 +253,12 @@ dayz_resetSelfActions = { call dayz_resetSelfActions; //Engineering variables -s_player_lastTarget = objNull; s_player_repairActions = []; //Initialize Medical Variables force_dropBody = false; r_interrupt = false; r_doLoop = false; -r_self = false; -r_self_actions = []; r_drag_sqf = false; r_action = false; r_action_unload = false; @@ -300,13 +287,10 @@ r_player_foodstack = 1; r_player_lowblood = false; r_player_timeout = 0; r_player_bloodTotal = r_player_blood; -r_public_blood = r_player_blood; -r_player_bloodDanger = r_player_bloodTotal * 0.2; r_player_actions = []; r_handlerCount = 0; r_action_targets = []; r_pitchWhine = false; -r_isBandit = false; dayz_DisplayGenderSelect = true; //blood test vars r_A_watered = false; @@ -680,6 +664,7 @@ if (!isDedicated) then { voice_actions = ["voiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"]; // EPOCH ADDITIONS + s_player_lastTarget = objNull; if (isNil "DZE_BackpackAntiTheft") then {DZE_BackpackAntiTheft = false;}; if (isNil "DZE_requireplot") then {DZE_requireplot = 1;}; if (isNil "DZE_StaticConstructionCount") then {DZE_StaticConstructionCount = 0;}; diff --git a/SQF/dayz_code/medical/setup_functions_med.sqf b/SQF/dayz_code/medical/setup_functions_med.sqf index 38fdf91c1..7dbb5b380 100644 --- a/SQF/dayz_code/medical/setup_functions_med.sqf +++ b/SQF/dayz_code/medical/setup_functions_med.sqf @@ -117,13 +117,6 @@ fnc_usec_medic_removeActions = { r_action_targets = []; }; -fnc_usec_self_removeActions = { - { - player removeAction _x; - } forEach r_self_actions; - r_self_actions = []; -}; - fnc_usec_calculateBloodPerSec = { private["_bloodLossPerSec","_bloodGainPerSec","_bloodPerSec"]; _bloodLossPerSec = 0;