private array updates + fixes

dayz_code/actions/ammo.sqf

@@ -1,4 +1,4 @@
-private["_ammoType","_vehicle","_ammo","_weapon","_turret","_text","_array"];
+private ["_ammoType","_vehicle","_ammo","_weapon","_turret","_text","_array","_magazines"];
 _array = _this select 3;
 _vehicle = _array select 0;
 _weapon = _array select 1;

dayz_code/actions/boil.sqf

@@ -1,4 +1,4 @@
-private["_hasbottleitem","_hastinitem","_bottletext","_tin1text","_tin2text","_tintext","_qty","_dis","_sfx"];
+private ["_hasbottleitem","_hastinitem","_bottletext","_tin1text","_tin2text","_tintext","_qty","_dis","_sfx","_removed"];
 
 if(TradeInprogress) exitWith { cutText ["Boil already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/build.sqf

@@ -1,4 +1,4 @@
-private["_location","_isOk","_dir","_classname","_item"];
+private ["_location","_isOk","_dir","_classname","_item","_cancel","_location3","_location4","_location1","_location2","_counter","_hasbuilditem","_dis","_sfx","_object","_onLadder","_isWater","_text","_offset_x","_offset_y","_offset_z","_offset_z_attach","_tmpbuilt","_built_location"];
 
 if(TradeInprogress) exitWith { cutText ["Building already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/call_zombies.sqf

@@ -1,5 +1,5 @@
-private ["_item","_id"];
+private [];
-_item = _this select 3;
+//_item = _this select 3;
 
 // remove menu
 player removeAction s_player_callzombies;

dayz_code/actions/cargocheck.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_class","_maxMagazines","_maxWeapons","_maxBackpacks","_magazineCount","_weaponsCount","_backpackCount"];
+private ["_vehicle","_class","_maxMagazines","_maxWeapons","_maxBackpacks","_magazineCount","_weaponsCount","_backpackCount","_magazineCount_raw","_weaponsCount_raw","_backpackCount_raw"];
 _vehicle = _this select 3;
 
 _class = typeOf _vehicle;

dayz_code/actions/cook.sqf

@@ -1,4 +1,4 @@
-private["_config","_item","_text","_rawmeat","_cookedmeat","_meat","_meatcooked","_qty","_id"];
+private ["_text","_rawmeat","_cookedmeat","_meat","_meatcooked","_qty","_started","_finished","_animState","_isMedic","_removed","_dis","_sfx"];
 
 if(TradeInprogress) exitWith { cutText ["Cooking already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/disassemble.sqf

@@ -1,3 +1,4 @@
+private ["_array","_object","_inventory"];
 _array = _this select 3;
 _object = _array select 0;
 _inventory = _array select 1;

dayz_code/actions/dog/feed.sqf

@@ -1,4 +1,4 @@
-private ["_array", "_handle", "_type", "_onLadder"];
+private ["_array","_handle","_type","_onLadder","_removed","_itemIn","_countIn"];
 _array = 	_this select 3;
 _handle = 	_array select 0;
 _type = 	_array select 1;

dayz_code/actions/engineer.sqf

@@ -1,3 +1,4 @@
+private ["_array","_location","_dir","_classname","_magazine","_weapon"];
 _array = _this select 3;
 _location = player modeltoworld [0,0.5,0];
 _dir = (getDir player) + 180;

dayz_code/actions/engineer_upgrade.sqf

@@ -1,3 +1,4 @@
+private ["_array","_object","_magazine","_classname","_dir","_location","_weapon"];
 _array = _this select 3;
 _object = _array select 0;
 _magazine = _array select 1;

dayz_code/actions/fill_nearestVehicle.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_location1","_location2","_abort","_canName","_canSizeEmpty","_canTypeEmpty","_canName","_canSize","_configCan","_configVeh","_capacity","_nameText","_availableCansEmpty","_availableCans"];
+private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_abort","_canSize","_configVeh","_capacity","_nameText","_isOk","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle"];
 
 if(TradeInprogress) exitWith { cutText ["Refuel already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;
@@ -75,7 +75,7 @@ if(_IsNearVehicle >= 1) then {
 
 			// Get vehicle fuel levels again
 			_curFuel = 		((fuel _vehicle) * _capacity);
-			_newFuel = 		(_curFuel + 20);
+			_newFuel = 		(_curFuel + _canSize);
 
 			if (_newFuel > _capacity) then {_newFuel = _capacity; _abort = true; };
 

dayz_code/actions/fill_startGenerator.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_started","_finished","_animState","_isMedic"];
+private ["_vehicle","_started","_finished","_animState","_isMedic","_soundSource"];
 
 if(TradeInprogress) exitWith { cutText ["Refuel already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;

dayz_code/actions/flare_pickup.sqf

@@ -1,4 +1,4 @@
-private["_flare"];
+private ["_flare","_text"];
 _flare = _this select 3;
 player playActionNow "PutDown";
 sleep 2;

dayz_code/actions/forcesave.sqf

@@ -1,5 +1,4 @@
-private["_object"];
+private [];
-
 //["dayzUpdateVehicle",[_this select 3,"all"]] call callRpcProcedure;
 dayzUpdateVehicle = [_this select 3,"all"];
-publicVariableServer "dayzUpdateVehicle";
+publicVariableServer "dayzUpdateVehicle";

dayz_code/actions/gather_meat.sqf

@@ -1,4 +1,4 @@
-private["_item","_hasKnife","_hasKnifeBlunt","_hasHarvested","_qty","_text","_string","_type"];
+private ["_item","_hasKnife","_hasKnifeBlunt","_hasHarvested","_qty","_text","_string","_type","_started","_finished","_animState","_isMedic","_array","_isListed","_config"];
 
 if(TradeInprogress) exitWith { cutText ["Gutting animal already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -52,7 +52,7 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
 		[objNull, player, rSwitchMove,""] call RE;
 		player playActionNow "stop";
 		cutText ["Canceled gutting." , "PLAIN DOWN"];
-		_abort = true;
+		//_abort = true;
 	};
 
 	_hasHarvested = _item getVariable["meatHarvested",false];

dayz_code/actions/gather_zparts.sqf

@@ -1,4 +1,4 @@
-private["_hasKnife","_qty","_item","_text","_string","_type","_loop","_meat","_timer"];
+private ["_hasKnife","_qty","_item","_text","_string","_type","_started","_finished","_animState","_isMedic","_array","_hasHarvested","_hasKnifeBlunt"];
 
 if(TradeInprogress) exitWith { cutText ["Gutting zombie already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -8,15 +8,15 @@ _hasKnife = 	"ItemKnife" in items player;
 _hasKnifeBlunt = 	"ItemKnifeBlunt" in items player;
 _type = typeOf _item;
 _hasHarvested = _item getVariable["meatHarvested",false];
-_config = 		configFile >> "CfgSurvival" >> "Meat" >> _type;
+//_config = 		configFile >> "CfgSurvival" >> "Meat" >> _type;
 
 player removeAction s_player_butcher;
 s_player_butcher = 1;
 
 if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
 	//Get Animal Type
-	_loop = true;	
+	//_loop = true;	
-	_isListed =		isClass (_config);
+	//_isListed =		isClass (_config);
 	_text = getText (configFile >> "CfgVehicles" >> _type >> "displayName");
 	
 	// force animation 
@@ -53,7 +53,7 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
 		[objNull, player, rSwitchMove,""] call RE;
 		player playActionNow "stop";
 		cutText ["Canceled gutting." , "PLAIN DOWN"];
-		_abort = true;
+		//_abort = true;
 	};
 
 	_hasHarvested = _item getVariable["meatHarvested",false];

dayz_code/actions/jerry_fill.sqf

@@ -1,4 +1,4 @@
-private["_hasFood","_item","_text","_qty"];
+private ["_qty","_started","_finished","_animState","_isMedic","_abort","_fillCounter","_dis","_sfx"];
 
 if(TradeInprogress) exitWith { cutText ["Fill Jerry already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -15,10 +15,10 @@ for "_x" from 1 to _qty do {
 	
 	_fillCounter = _fillCounter + 1;
 
-	if(_siphonQty == 1) then {
+	if(_qty == 1) then {
 		cutText ["Preparing to siphon, stand still to fill empty jerry can.", "PLAIN DOWN"];
 	} else {
-		cutText [format[("Preparing to siphon, stand still to fill empty jerry can %1 of %2."),_fillCounter,_siphonQty] , "PLAIN DOWN"];
+		cutText [format[("Preparing to siphon, stand still to fill empty jerry can %1 of %2."),_fillCounter,_qty] , "PLAIN DOWN"];
 	};
 
 	// force animation 

dayz_code/actions/list_playerDeaths.sqf

@@ -1,4 +1,4 @@
-private["_activatingPlayer","_trader_id","_category","_action","_id","_type","_loc","_name","_qty","_cost","_qty","_sell","_cur","_order","_tid","_currency","_actionFile","_in","_out","_part","_cat","_cancel","_Display","_File","_textCurrency","_textPart"];
+private ["_activatingPlayer"];
 
 // [ _trader_id, _category, _action ];
 _activatingPlayer = _this select 1;

dayz_code/actions/object_pickup.sqf

@@ -1,4 +1,4 @@
-private["_array","_type","_classname","_holder","_config","_isOk","_muzzles","_playerID","_claimedBy","_text","_control","_dialog","_item","_val","_max","_bolts","_quivers","_quiver","_broken"];
+private ["_array","_type","_classname","_holder","_config","_isOk","_muzzles","_playerID","_claimedBy","_text","_broken","_playerNear","_obj","_qty"];
 
 // Exit if player zombie
 if(player isKindOf "PZombie_VB") exitWith {};
@@ -60,7 +60,7 @@ if(_classname isKindOf "Bag_Base_EP1") then {
 };
 
 // test to see if item still exists just before adding and removing
-if(_holder == objNull) exitWith { TradeInprogress = false; };
+if(isNull _holder) exitWith { TradeInprogress = false; };
 
 _obj = nearestObjects [(getPosATL player), [(typeOf _holder)], 5];
 _qty = count _obj;

dayz_code/actions/pack.sqf

@@ -1,3 +1,4 @@
+private ["_array","_object","_type"];
 _array = _this select 3;
 _object = _array select 0;
 _type = TypeOf(_object);

dayz_code/actions/player_addToolbelt.sqf

@@ -1,4 +1,4 @@
-private["_item","_config","_onLadder","_create","_isOk","_config2","_consume"];
+private ["_item","_config","_onLadder","_create","_isOk","_config2","_magType","_meleeNum","_muzzles","_wtype","_type","_hastoolweapon","_text"];
 
 if(TradeInprogress) exitWith { cutText ["Add to toolbelt already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/player_build.sqf

@@ -1,4 +1,4 @@
-private ["_location","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_isBuilding","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_buildings","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object"];
+private ["_location","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_isBuilding","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_buildings","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole"];
 
 if(TradeInprogress) exitWith { cutText ["Building already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -78,7 +78,7 @@ _hasrequireditem = true;
 	if(!_hastoolweapon) exitWith { _hasrequireditem = false; _missing = _x; }
 } forEach _require;
 
-_hasbuilditem = _this in magazines playwer;
+_hasbuilditem = _this in magazines player;
 if (!_hasbuilditem) exitWith {TradeInprogress = false; cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]; };
 
 if (!_hasrequireditem) exitWith {TradeInprogress = false; cutText [format["Missing tool %1",_missing] , "PLAIN DOWN"]; };
@@ -144,8 +144,6 @@ if (_hasrequireditem) then {
 	// Start Build 
 	_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
 
-	_tmpbuilt setVariable ["ObjectID",1,true];
-	
 	_dir = getDir player;
 	_tmpbuilt setdir _dir;
 	

dayz_code/actions/player_chopWood.sqf

@@ -1,4 +1,4 @@
-private ["_item","_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_sfx","_dis","_animState","_isMedic","_proceed","_counter","_objType","_limit","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree"];
+private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree"];
 
 if(TradeInprogress) exitWith { cutText ["Harvest wood already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -6,7 +6,7 @@ TradeInprogress = true;
 // allowed trees list move this later
 _trees = ["t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_ficusb2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d"];
 
-_item = _this;
+//_item = _this;
 call gear_ui_init;
 
 _findNearestTree = [];

dayz_code/actions/player_copyKey.sqf

@@ -1,4 +1,4 @@
-private["_item","_config","_onLadder","_create","_isOk","_config2","_consume"];
+private ["_item","_config","_onLadder","_create","_started","_finished","_animState","_isMedic","_qty","_box","_num_removed","_text","_haskey","_hastoolweapon","_isNear","_hasTinBar"];
 
 if(TradeInprogress) exitWith { cutText ["Copy key already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/player_drink.sqf

@@ -1,4 +1,4 @@
-private["_onLadder","_itemorignal","_hasdrinkitem","_hasoutput","_config","_text","_sfx","_dis","_id","_itemtodrop","_nearByPile","_item","_display"];
+private ["_onLadder","_itemorignal","_hasdrinkitem","_hasoutput","_config","_text","_sfx","_dis","_itemtodrop","_nearByPile","_item","_display"];
 
 disableserialization;
 call gear_ui_init;

dayz_code/actions/player_dropWeapon.sqf

@@ -1,4 +1,4 @@
-private["_item"];
+private ["_item","_config","_onLadder","_consume","_meleeNum","_bag"];
 _item = 	_this;
 _config =	configFile >> "CfgWeapons" >> _item;
 

dayz_code/actions/player_eat.sqf

@@ -1,4 +1,4 @@
-private["_onLadder","_itemorignal","_hasfooditem","_rawfood","_cookedfood","_hasoutput","_config","_text","_regen","_dis","_sfx","_Cookedtime","_itemtodrop","_nearByPile","_item","_display"];
+private ["_onLadder","_itemorignal","_hasfooditem","_rawfood","_hasoutput","_config","_text","_regen","_dis","_sfx","_itemtodrop","_nearByPile","_item","_display","_rawexceptions","_badfood"];
 disableserialization;
 call gear_ui_init;
 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
@@ -14,7 +14,7 @@ _hasfooditem = _itemorignal in magazines player;
 
 _rawfood = _itemorignal in meatraw;
 _rawexceptions = _itemorignal in exceptionsraw;
-_cookedfood = _itemorignal in meatcooked;
+//_cookedfood = _itemorignal in meatcooked;
 _hasoutput = _itemorignal in food_with_output;
 
 _badfood = _itemorignal in badfood;

dayz_code/actions/player_flipvehicle.sqf

@@ -1,7 +1,7 @@
-private["_object","_position"];
+private ["_object"];
 _object = _this select 3;
 
-_position = [position _object,0,0,0,0,0,0,position player] call BIS_fnc_findSafePos;
+// _position = [position _object,0,0,0,0,0,0,position player] call BIS_fnc_findSafePos;
 
 //Standup
 //player playMove "amovpercmstpsraswrfldnon_amovpknlmstpslowwrfldnon";

dayz_code/actions/player_makefire.sqf

@@ -1,4 +1,4 @@
-private["_location","_isOk","_dir","_classname"];
+private ["_location","_isOk","_dir","_classname","_fire","_hasWood"];
 _location = player modeltoworld [0,0.3,0];
 if ((_location select 2) < 0) then {
 	_location set [2,0];
@@ -18,7 +18,7 @@ if (_hasWood) then {
 		_fire setDir _dir;
 		player reveal _fire;
 		
-		_id = _fire spawn player_fireMonitor;
+		_fire spawn player_fireMonitor;
 		
 		cutText [localize "str_fireplace_01", "PLAIN DOWN"];
 	} else {

dayz_code/actions/player_reloadMags.sqf

@@ -1,4 +1,4 @@
-private["_item","_config","_consume","_create","_item_ammo","_consume_magsize","_create_magsize","_consume_type","_slotstart","_slotend","_dialog","_qty_total_ammo","_qty_consume_ammo","_qty_create_ammo","_qty_consume_mags","_qty_create_mags","_qty_free_slots","_control","_i","_mag","_qtynew_create_ammo","_qtynew_consume_ammo","_qtynew_create_mags","_qtynew_consume_mags","_qtynew_consume_mags_full","_qtynew_create_mags_full","_qtynew_consume_ammo_rest","_qtynew_create_ammo_rest","_avaliable_slots"];
+private ["_item","_config","_consume","_create","_item_ammo","_consume_magsize","_create_magsize","_consume_type","_slotstart","_slotend","_dialog","_qty_total_ammo","_qty_consume_ammo","_qty_create_ammo","_qty_consume_mags","_qty_create_mags","_qty_free_slots","_control","_mag","_qtynew_create_ammo","_qtynew_consume_ammo","_qtynew_create_mags","_qtynew_consume_mags","_qtynew_consume_mags_full","_qtynew_create_mags_full","_qtynew_consume_ammo_rest","_qtynew_create_ammo_rest","_avaliable_slots"];
 
 disableSerialization;
 call gear_ui_init;

dayz_code/actions/player_setTrap.sqf

@@ -1,6 +1,6 @@
-private["_item"];
+private ["_item","_onLadder","_classname","_text","_hastrapitem","_location","_object","_dir"];
 _item = 	_this;
-_config =	configFile >> "CfgWeapons" >> _item;
+// _config =	configFile >> "CfgWeapons" >> _item;
 
 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
 if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
@@ -9,7 +9,7 @@ call gear_ui_init;
 
 _classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
 _text = 		getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
-_consume = 	([] + getArray (_config >> "magazines")) select 0;
+//_consume = 	([] + getArray (_config >> "magazines")) select 0;
 
 _hastrapitem = _this in magazines player;
 
@@ -22,6 +22,7 @@ player playActionNow "PutDown";
 sleep 1;
 
 _object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
+_dir = getDir player;
 _object setDir _dir;
 player reveal _object;
 

dayz_code/actions/player_tagFriendly.sqf

@@ -16,7 +16,7 @@ _rfriendlies = _target getVariable ["friendlies", []];
 
 if (!(_callerID in _rfriendlies)) then {
 	// caller
-	titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept.",(name _target)], "PLAIN DOWN"];
+	titleText [format["You have tagged a player as friendly. Waiting for other player to accept.",(name _target)], "PLAIN DOWN"];
 	// target
-	[_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
+	[_caller,_target,"loc",rTITLETEXT,format["A player wants to tag you as friendly. To accept, tag player as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
 };

dayz_code/actions/player_useMeds.sqf

@@ -1,4 +1,4 @@
-private["_item"];
+private ["_item","_id","_onLadder","_hasmeditem","_config","_text"];
 _item = _this;
 call gear_ui_init;
 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;

dayz_code/actions/player_wearClothes.sqf

@@ -2,7 +2,7 @@
 _item spawn player_wearClothes;
 Added Female skin changes - DayZ Epoch - vbawol
 */
-private["_item","_onLadder","_hasclothesitem","_config","_text","_isFemale","_myModel","_itemNew","_currentSex","_newSex","_model"];
+private ["_item","_onLadder","_hasclothesitem","_config","_text","_myModel","_itemNew","_currentSex","_newSex","_model"];
 
 if(TradeInprogress) exitWith { cutText ["Changing clothes already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;

dayz_code/actions/pzombie/pz_feed.sqf

@@ -1,6 +1,6 @@
-private ["_item","_id","_regen","_isAnimal","_animalType","_isMan","_config","_isListed","_qty","_ent","_ctrlBlood","_rnd","_move","_display","_control","_bloodVal"];
+private ["_item","_regen","_isAnimal","_animalType","_isMan","_config","_isListed","_qty","_ctrlBlood","_rnd","_move","_display","_control","_bloodVal"];
 _item = _this select 3;
-_ent = _item;
+// _ent = _item;
 
 disableSerialization;
 
@@ -9,7 +9,7 @@ s_player_butcher = 1;
 
 if(!(alive _item)) then {
 
-	_rnd = round(random 4) + 1;
+    _rnd = (round(random 4)) + 1;
 	_move = "ZombieFeed" + str(_rnd);
 	player playMoveNow _move;
 
@@ -76,6 +76,7 @@ if(!(alive _item)) then {
 	_control = 	_display displayCtrl 1301;
 	_control ctrlShow true;
 
+    _ctrlBlood = 	_display displayCtrl 1300;
 	_bloodVal =		r_player_blood / r_player_bloodTotal;
 	if (_bloodVal >= 0.2) then {
 		_ctrlBlood ctrlShow true;

dayz_code/actions/pzombie/pz_vision.sqf

@@ -1,5 +1,5 @@
 
-private ["_gen","_caller","_id","_NV","_NVOn","_OldAperture"];
+private ["_gen","_caller","_id","_NV","_NVOn","_OldAperture","_NV1","_NV2","_NV3"];
 _gen = _this select 0;
 _caller = _this select 1;
 _id = _this select 2;

dayz_code/actions/pzombie/pz_vision_ap.sqf

@@ -1,4 +1,4 @@
-private ["_gen","_caller","_id","_NV","_NVOn","_OldAperture"];
+private ["_gen","_caller","_id","_NV","_NVOn","_new","_inc","_newap"];
 
 _gen = _this select 0;
 _caller = _this select 1;

dayz_code/actions/pzombie/pz_vision_rbg1.sqf

@@ -1,4 +1,4 @@
-private ["_gen","_caller","_id","_NV","_NVOn","_OldAperture"];
+private ["_gen","_caller","_id","_NV","_NVOn","_index","_NV1","_NV2","_NV3","_new","_NVx","_increase","_newap"];
 
 _gen = _this select 0;
 _caller = _this select 1;

dayz_code/actions/refuel.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_location1","_location2","_abort","_canName","_canSizeEmpty","_canTypeEmpty","_canName","_canSize","_configCan","_configVeh","_capacity","_nameText","_availableCansEmpty","_availableCans"];
+private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_location1","_location2","_abort","_canName","_canSize","_configCan","_configVeh","_capacity","_nameText","_availableCans","_canText"];
 
 if(TradeInprogress) exitWith { cutText ["Refuel already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;

dayz_code/actions/remove.sqf

@@ -2,7 +2,7 @@
 delete object from db with extra waiting by [VB]AWOL
 parameters: _obj
 */
-private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_id","_objType","_sfx","_dis","_itemOut","_countOut","_textCreate","_selectedRemoveOutput"];
+private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot"];
 
 if(TradeInprogress) exitWith { cutText ["Remove already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/repair.sqf

@@ -1,4 +1,4 @@
-private["_vehicle","_part","_hitpoint","_type","_selection","_array"];
+private ["_vehicle","_part","_hitpoint","_type","_selection","_array","_started","_finished","_animState","_isMedic","_num_removed","_damage","_dis","_sfx","_allFixed","_id","_hasToolbox","_section","_nameType","_namePart","_hitpoints"];
 
 if(TradeInprogress) exitWith { cutText ["Repair already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/repair_vehicle.sqf

@@ -1,7 +1,7 @@
-private["_activatingPlayer","_trader_id","_category","_action","_id","_type","_loc","_name","_qty","_cost","_qty","_sell","_cur","_order","_tid","_currency","_actionFile","_in","_out","_part","_cat","_cancel","_Display","_File","_textCurrency","_textPart"];
+private ["_part","_cancel","_color","_allFixed","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
 
 // [ _trader_id, _category, _action ];
-_activatingPlayer = _this select 1;
+// _activatingPlayer = _this select 1;
 
 _vehicle = _this select 3;
 

dayz_code/actions/salvage.sqf

@@ -1,9 +1,9 @@
-private["_vehicle","_part","_hitpoint","_type","_selection","_array"];
+private ["_vehicle","_part","_hitpoint","_type","_selection","_array","_started","_finished","_animState","_isMedic","_isOK","_brokenPart","_findPercent","_damage","_hasToolbox","_nameType","_namePart"];
 
 if(TradeInprogress) exitWith { cutText ["Salvage already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
-_id = _this select 2;
+//_id = _this select 2;
 _array = 	_this select 3;
 _vehicle = 	_array select 0;
 _part =		_array select 1;
@@ -28,7 +28,7 @@ if (_hasToolbox) then {
 	player playActionNow "Medic";
 
 	[player,"repair",0,false] call dayz_zombieSpeak;
-	null = [player,50,true,(getPosATL player)] spawn player_alertZombies;
+	[player,50,true,(getPosATL player)] spawn player_alertZombies;
 
 	r_interrupt = false;
 	_animState = animationState player;
@@ -97,16 +97,11 @@ if (_hasToolbox) then {
 					cutText [format["You have successfully removed %1 from the %2",_namePart,_nameType], "PLAIN DOWN"];
 				};
 
-
-			
-
 			} else {
 				cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
 			};
-
 		
 		};
-
 	
 	} else {
 		r_interrupt = false;

dayz_code/actions/salvage_vehicle.sqf

@@ -1,14 +1,14 @@
-private["_activatingPlayer","_trader_id","_category","_action","_id","_type","_loc","_name","_qty","_cost","_qty","_sell","_cur","_order","_tid","_currency","_actionFile","_in","_out","_part","_cat","_cancel","_Display","_File","_textCurrency","_textPart"];
+private ["_part","_cancel","_color","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
 
 // [ _trader_id, _category, _action ];
-_activatingPlayer = _this select 1;
+// _activatingPlayer = _this select 1;
 
 _vehicle = _this select 3;
 
 {dayz_myCursorTarget removeAction _x} forEach s_player_repairActions;s_player_repairActions = [];
 // dayz_myCursorTarget = _vehicle;
 
-_allFixed = true;
+// _allFixed = true;
 _hitpoints = _vehicle call vehicle_getHitpoints;
 
 {			

dayz_code/actions/sell_db.sqf

@@ -1,4 +1,4 @@
-private["_activatingPlayer","_trader_id","_category","_action","_id","_type","_loc","_name","_qty","_cost","_qty","_sell","_cur","_order","_tid","_currency","_actionFile","_in","_out","_part","_cat","_cancel","_Display","_File","_textCurrency","_textPart","_count"];
+private ["_activatingPlayer","_trader_id","_type","_name","_sell","_order","_tid","_in","_part","_cancel","_Display","_File","_textCurrency","_textPart","_count","_btype","_stype","_bag","_bagclass","_header","_item","_buy","_sqty","_sname","_afile"];
 
 if(TradeInprogress) exitWith { cutText ["already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -9,14 +9,14 @@ TradeInprogress = true;
 _activatingPlayer = _this select 1;
 
 _trader_id = (_this select 3) select 0;
-_category = (_this select 3) select 1;
+//_category = (_this select 3) select 1;
 
 dayzTraderMenuResult = call compile format["tcacheSell_%1;",_trader_id];
 
 if(isNil "dayzTraderMenuResult") then {
 	diag_log format["DEBUG TRADER OBJ: %1", _trader_id];
 	//["dayzTraderMenu",[_activatingPlayer,_trader_id,_category,_action]] call callRpcProcedure;
-	dayzTraderMenu = [_activatingPlayer,_trader_id,_category,_action];
+	dayzTraderMenu = [_activatingPlayer,_trader_id];
 	publicVariableServer  "dayzTraderMenu";
 	waitUntil {!isNil "dayzTraderMenuResult"};
 };
@@ -44,12 +44,12 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
 	_textPart =	getText(configFile >> _type >> _name >> "displayName");
 	
 	// Total in stock
-	_qty = _x select 2;
+	//_qty = _x select 2;
 	
 	// Buy Data from array
 	_buy = _x select 3;	
-	_bqty = _buy select 0;
+	//_bqty = _buy select 0;
-	_bname = _buy select 1;
+	//_bname = _buy select 1;
 	_btype = _buy select 2;
 	switch(true)do{ 
 		case (_btype == 1): { 
@@ -63,7 +63,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
 		}; 
 	}; 
 	// Display Name of buy item
-	_textCurrencyBuy =	getText(configFile >> _btype >> _bname >> "displayName");
+	//_textCurrencyBuy =	getText(configFile >> _btype >> _bname >> "displayName");
 	
 	// Sell data from array
 	_sell = _x select 4;
@@ -95,7 +95,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
 	_File = "\z\addons\dayz_code\actions\" + _afile + ".sqf";
 	
 	// Allways 1 for now
-	_out = _sqty;
+	//_out = _sqty;
 	// qty consumed of bname
 	_in = 1;
 	

dayz_code/actions/siphonFuel.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_location1","_location2","_abort","_canNameEmpty","_canSizeEmpty","_canTypeEmpty","_canName","_canSize","_configCanEmpty","_configVeh","_capacity","_nameText","_availableCansEmpty","_availableCans"];
+private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_location1","_location2","_abort","_canNameEmpty","_canSizeEmpty","_canTypeEmpty","_canName","_canSize","_configCanEmpty","_configVeh","_capacity","_nameText","_availableCansEmpty"];
 
 if(TradeInprogress) exitWith { cutText ["Siphon already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;
@@ -14,7 +14,7 @@ _capacity = 	getNumber(_configVeh >> "fuelCapacity");
 _nameText = 	getText(_configVeh >> "displayName");
 
 _availableCansEmpty = ["ItemJerrycanEmpty","ItemFuelBarrelEmpty"];
-_availableCans = ["ItemJerrycan","ItemFuelBarrel"];
+// _availableCans = ["ItemJerrycan","ItemFuelBarrel"];
 
 // Loop to find containers that can could hold fuel and fill them
 {

dayz_code/actions/stopGenerator.sqf

@@ -1,4 +1,4 @@
-private ["_vehicle","_started","_finished","_animState","_isMedic"];
+private ["_vehicle","_started","_finished","_animState","_isMedic","_soundObject"];
 
 if(TradeInprogress) exitWith { cutText ["Stop already in progress." , "PLAIN DOWN"] };
 TradeInprogress = true;

dayz_code/actions/tame_dog.sqf

@@ -14,7 +14,7 @@
 	_dog = Intended target of the script.
 */
 
-private["_target", "_caller", "_id", "_dog", "_pos", "_fsmid"];
+private ["_target","_caller","_id","_dog","_fsmid","_removed","_selected","_animalID","_textRemoved","_chanceToFail","_itemIn","_countIn"];
 _target = 	_this select 0;
 _caller = 	_this select 1;
 _id =		_this select 2;
@@ -40,7 +40,7 @@ if(_removed == _countIn) then {
 	_textRemoved = getText(configFile >> "CfgMagazines" >> _selected >> "displayName");
 	
 	// add failure rate based on skill level variable (days alive) 
-	_chanceToFail = ((random 1 + (dayz_skilllevel/100)) > 0.5);
+    _chanceToFail = (((random 1) + (dayz_skilllevel/100)) > 0.5);
 	
 	if(!_chanceToFail) then { 
 		

dayz_code/actions/tent_pitch.sqf

@@ -1,4 +1,4 @@
-private["_position","_tent","_location","_isOk","_backpack","_tentType","_trg","_key"];
+private ["_location","_isOk","_pondPos","_isPond","_dir","_dis","_sfx","_classname","_object","_playerPos","_item","_hastentitem","_building","_config","_text","_objectsPond"];
 //check if can pitch here
 call gear_ui_init;
 _playerPos = 	getPosATL player;

dayz_code/actions/trade_backpacks.sqf

@@ -1,4 +1,4 @@
-private["_iarray","_part_out","_part_in","_qty_out","_qty_in","_qty"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"];
 //		   [part_out,part_in, qty_out, qty_in,];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };

dayz_code/actions/trade_cancel.sqf

@@ -1,3 +1,3 @@
-private["_none"];
+private [];
 {player removeAction _x} forEach s_player_parts;s_player_parts = [];
 s_player_parts_crtl = -1;

dayz_code/actions/trade_items.sqf

@@ -1,4 +1,4 @@
-private["_iarray","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_isOk"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_tradeCounter","_next_highest_bar","_third_highest_bar","_next_highest_conv","_third_highest_conv","_third_parts_out_raw","_third_parts_out","_remainder","_next_parts_out_raw","_next_parts_out","_activatingPlayer","_traderID","_total_trades"];
 // [part_out,part_in, qty_out, qty_in,];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"] };

dayz_code/actions/trade_items_wo_db.sqf

@@ -1,4 +1,4 @@
-private["_activatingPlayer","_part_out","_part_in","_qty_out","_qty_in","_buy_o_sell","_textPartIn","_textPartOut","_traderID","_counter","_failed","_qty","_isOk","_needed"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut","_qty","_needed","_started","_finished","_animState","_isMedic","_abort","_removed","_tradeCounter","_total_trades"];
 // [part_out,part_in, qty_out, qty_in,];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
@@ -10,7 +10,7 @@ _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;
 _qty_out = (_this select 3) select 2;
 _qty_in = (_this select 3) select 3;
-_buy_o_sell = (_this select 3) select 4;
+// _buy_o_sell = (_this select 3) select 4;
 _textPartIn = (_this select 3) select 5;
 _textPartOut = (_this select 3) select 6;
 //_traderID = (_this select 3) select 7;

dayz_code/actions/trade_metals.sqf

@@ -1,4 +1,4 @@
-private["_none"];
+private ["_buy","_metals_conversion","_cancel"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/actions/trade_weapons.sqf

@@ -1,4 +1,4 @@
-private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_bulkItem","_bulkqty","_gold_out","_gold_qty_out","_partial_qty_out","_silver_qty_out","_needed","_activatingPlayer","_textPartIn","_textPartOut"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic"];
 // [part_out,part_in, qty_out, qty_in,"buy"];
 
 if(TradeInprogress) exitWith { cutText ["Trade already in progress." , "PLAIN DOWN"]; };

dayz_code/actions/unpack.sqf

@@ -1,3 +1,5 @@
+
+private ["_array","_location","_dir","_classname","_weapon"];
 _array = _this select 3;
 _location = player modeltoworld [0,1,0];
 _dir = getDir player;

dayz_code/actions/vault_pitch.sqf

@@ -34,6 +34,7 @@ if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"p
 
 
 //diag_log ("Pitch Tent: " + str(_isok) );
+_dir = getDir player;
 
 // Start Preview loop 
 _tmpvault = createVehicle ["VaultStorageLocked", _location, [], 0, "CAN_COLLIDE"];

dayz_code/actions/water_fill.sqf

@@ -1,4 +1,4 @@
-private["_hasFood","_item","_text","_qty"];
+private ["_text","_qty","_canFill","_isWell","_objectsWell","_pondPos","_isPond","_objectsPond","_dis","_sfx","_playerPos","_onLadder","_hasbottleitem","_config"];
 
 call gear_ui_init;
 
@@ -14,7 +14,7 @@ if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
 
 _hasbottleitem = _this in magazines player;
 
-_config = configFile >> "CfgMagazines" >> _item;
+_config = configFile >> "CfgMagazines" >> _this;
 _text = getText (_config >> "displayName");
 
 if (!_hasbottleitem) exitWith {cutText [format[(localize "str_player_31"),_text,"fill"] , "PLAIN DOWN"]};

dayz_code/cfgworlds/intro.Chernarus/initIntro.sqf

@@ -1,3 +1,4 @@
+private ["_target","_position","_camera"];
 titleCut ["","BLACK FADED",10e10];
 
 setViewDistance 3000;

dayz_code/compile/building_spawnLoot.sqf

@@ -1,4 +1,4 @@
-private["_obj","_type","_config","_positions","_iPos","_nearBy","_itemType","_itemTypes","_itemChances","_lootChance","_weights","_cntWeights","_index"];
+private ["_obj","_type","_config","_positions","_iPos","_nearBy","_itemType","_itemTypes","_lootChance","_weights","_cntWeights","_index"];
 
 _obj = 			_this select 0;
 

dayz_code/compile/building_spawnZombies.sqf

@@ -15,7 +15,7 @@ if (_canLoot) then {
 	_max = 			getNumber (_config >> "maxRoaming");
 //Walking Zombies
 	//_num = round(random _max) min _min;
-	_num = round(random _max) max _min;
+    _num = (round(random _max)) max _min;
 	_config = 		configFile >> "CfgBuildingLoot" >> _type;
 //Get zombie class
 	_zombieChance =	getNumber (_config >> "zombieChance");

dayz_code/compile/control_zombieAgent.sqf

@@ -1,4 +1,4 @@
-private["_position","_unitTypes","_group","_unit","_target","_bodies","_targetPos","_codeSpawns","_unitSpawn","_lead","_isAlive","_units"];
+private ["_position","_target","_targetPos","_isAlive","_list","_isSomeone","_myDest","_agent"];
 //Definitions
 _agent = _this select 0;
 
@@ -8,6 +8,7 @@ _agent = _this select 0;
 //Loop behaviour
 _list = (getposATL _agent) nearEntities ["Man",200];
 _isSomeone = ({isPlayer _x} count _list) > 0;
+_isAlive = alive _agent;
 while {_isAlive and _isSomeone} do {
 //NO TARGET
 	_agent disableAI "FSM";

dayz_code/compile/dog_findTargetAgent.sqf

@@ -1,4 +1,4 @@
-private["_dog","_target","_targets","_targetDis","_c","_man","_manDis","_targets","_agentheight","_nearEnts","_rnd","_assigned","_range","_objects"];
+private ["_dog","_target","_targets","_man","_manDis"];
 _dog = _this;
 _target = objNull;
 _targets = [];

dayz_code/compile/fn_buildWeightedArray.sqf

@@ -18,8 +18,8 @@ scriptName "Functions\arrays\fn_selectRandomWeighted.sqf";
 	[*] Algorithm is inefficient?
 */
 
-private ["_array", "_weights"];
+private ["_weights","_weighted"];
-_array = _this select 0;
+//_array = _this select 0;
 _weights = _this select 1;
 
 /*

dayz_code/compile/fn_curTimeStr.sqf

@@ -1,3 +1,4 @@
+private ["_hrStr","_minStr","_curDate","_hr","_min"];
 _curDate = date;
 _hr = _curDate select 3;
 _min = _curDate select 4;

dayz_code/compile/fn_damageActions.sqf

@@ -4,7 +4,7 @@ scriptName "Functions\misc\fn_damageActions.sqf";
 	- Function
 	- [] call fnc_usec_damageActions;
 ************************************************************/
-private ["_weaponName","_action","_turret","_weapons","_assignedRole","_action1","_action2","_x","_vehicle","_unit","_vehType","_displayName","_ammoQty","_ammoSerial","_weapon","_magTypes","_type","_typeVeh","_index","_inventory","_unitTo","_isEngineer","_vehClose","_hasVehicle","_unconscious","_lowBlood","_injured","_inPain","_legsBroke","_armsBroke","_charID","_friendlies","_playerMagazines","_hasBandage","_hasEpi","_hasMorphine","_hasBlood","_hasToolbox","_hasJerry","_hasJerryE","_hasEtool","_hasWire","_hasPainkillers","_unconscious_crew","_patients","_crew","_menClose","_hasPatient","_inVehicle","_isClose","_bag","_classbag","_isDisallowRefuel","_hasBarrel","_hasBarrelE"];
+private ["_weaponName","_action","_turret","_weapons","_assignedRole","_action1","_action2","_x","_vehicle","_unit","_vehType","_displayName","_ammoQty","_ammoSerial","_weapon","_magTypes","_type","_typeVeh","_index","_inventory","_unitTo","_isEngineer","_vehClose","_hasVehicle","_unconscious","_lowBlood","_injured","_inPain","_legsBroke","_armsBroke","_charID","_friendlies","_playerMagazines","_hasBandage","_hasEpi","_hasMorphine","_hasBlood","_hasToolbox","_hasJerry","_hasJerryE","_hasWire","_hasPainkillers","_unconscious_crew","_patients","_crew","_menClose","_hasPatient","_inVehicle","_isClose","_bag","_classbag","_isDisallowRefuel","_hasBarrel","_hasBarrelE"];
 
 if (TradeInprogress) exitWith {}; // Do not allow if any script is running.
 
@@ -65,7 +65,7 @@ if (_hasPatient and !r_drag_sqf and !r_action and !_inVehicle and !r_player_unco
 	_hasBarrel = 	"ItemFuelBarrel" in _playerMagazines;
 	_hasJerryE = 	"ItemJerrycanEmpty" in _playerMagazines;
 	_hasBarrelE = 	"ItemFuelBarrelEmpty" in _playerMagazines;
-	_hasEtool = 	"ItemEtool" in weapons player;
+	//_hasEtool = 	"ItemEtool" in weapons player;
 	_hasWire = 		"ItemWire" in _playerMagazines;
 	_hasPainkillers = 	"ItemPainkiller" in _playerMagazines;
 

dayz_code/compile/fn_damageHandler.sqf

@@ -1,10 +1,12 @@
+
+private ["_unit","_humanityHit","_myKills","_hit","_damage","_isPlayer","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_isCardiac","_isHeadHit","_isMinor","_scale","_canHitFree","_rndPain","_rndInfection","_hitInfection","_lowBlood","_isPZombie","_source","_ammo","_unitIsPlayer"];
 scriptName "Functions\misc\fn_damageHandler.sqf";
 /***********************************************************
 	PROCESS DAMAGE TO A UNIT
 	- Function
 	- [unit, selectionName, damage, source, projectile] call fnc_usec_damageHandler;
 ************************************************************/
-private["_unit","_humanityHit","_myKills","_isBandit","_hit","_damage","_isPlayer","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_inPain","_isDead","_isCardiac","_killerID","_evType","_recordable","_isHeadHit","_isMinor","_scale","_canHitFree"];
+private ["_unit","_humanityHit","_myKills","_hit","_damage","_isPlayer","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_isCardiac","_isHeadHit","_isMinor","_scale","_canHitFree","_rndPain","_rndInfection","_hitInfection","_lowBlood","_isPZombie","_source","_ammo","_unitIsPlayer"];
 _unit = _this select 0;
 _hit = _this select 1;
 _damage = _this select 2;
@@ -14,8 +16,8 @@ _ammo = _this select 4;
 _type = [_damage,_ammo] call fnc_usec_damageType;
 _isMinor = (_hit in USEC_MinorWounds);
 _isHeadHit = (_hit == "head_hit");
-_evType = "";
+//_evType = "";
-_recordable = false;
+//_recordable = false;
 _isPlayer = (isPlayer _source);
 _humanityHit = 0;
 _myKills = 0;
@@ -161,7 +163,7 @@ if (_damage > 0.4) then {	//0.25
 			};
 		};
 		if ((_damage > 1.5) and _isHeadHit) then {
-			_id = [_source,"shothead"] spawn player_death;
+			[_source,"shothead"] spawn player_death;
 		};
 	};
 	if(!_isHit) then {
@@ -203,7 +205,7 @@ if (_type == 1) then {
 	if (_damage > 4) then {
 		//serious ballistic damage
 		if (_unitIsPlayer) then {
-			_id = [_source,"explosion"] spawn player_death;
+			[_source,"explosion"] spawn player_death;
 		};
 	} else {
 		if (_damage > 2) then {
@@ -222,7 +224,7 @@ if (_type == 2) then {
 	if (_damage > 4) then {
 		//serious ballistic damage
 		if (_unitIsPlayer) then {
-			_id = [_source,"shotheavy"] spawn player_death;
+			[_source,"shotheavy"] spawn player_death;
 		};
 	} else {
 		if (_damage > 2) then {

dayz_code/compile/fn_damageHandlerVehicle.sqf

@@ -4,12 +4,12 @@ scriptName "Functions\misc\fn_damageHandler.sqf";
 	- Function
 	- [unit, selectionName, damage, source, projectile] call fnc_usec_damageHandler;
 ************************************************************/
-private["_unit","_hit","_damage","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_inPain","_isDead","_isCardiac","_killerID","_evType","_recordable","_inVehicle","_isHeadHit","_isMinor","_total"];
+private ["_unit","_hit","_damage","_total"];
 _unit = _this select 0;
 _hit = _this select 1;
 _damage = _this select 2;
-_source = _this select 3;
+//_source = _this select 3;
-_ammo = _this select 4;
+//_ammo = _this select 4;
 _total = _damage;
 
 //diag_log ("DAMAGE VEH: " + typeof(_unit) + " / " + str(_hit) + " / " + str(_damage) + " / " + str(getDammage _unit));

dayz_code/compile/fn_isInsideBuilding.sqf

@@ -1,9 +1,9 @@
-private["_unit1","_building","_type","_relPos","_boundingBox","_min","_max","_myX","_myY","_myZ","_inside"];
+private ["_unit1","_building","_relPos","_boundingBox","_min","_max","_myX","_myY","_myZ","_inside"];
 _unit1 = _this select 0;
 //_building = _this select 1;
 _building = nearestObject [player, "HouseBase"];
  
-_type = typeOf _building;
+//_type = typeOf _building;
 _relPos = _building worldToModel (getPosATL _unit1);
 _boundingBox = boundingBox _building;
 //diag_log ("DEBUG: Building: " + str(_building) );

dayz_code/compile/fn_selectRandomWeighted.sqf

@@ -18,7 +18,7 @@ scriptName "Functions\arrays\fn_selectRandomWeighted.sqf";
 	[*] Algorithm is inefficient?
 */
 
-private ["_array", "_weights","_index","_weighted","_i"];
+private ["_array","_weights","_index","_weighted"];
 _array = _this select 0;
 _weights = _this select 1;
 

dayz_code/compile/fn_setpitchbank.sqf

@@ -67,7 +67,7 @@ _v
 _sign = [1,-1] select (_pitch < 0);
 
 //cut off numbers above 180
-while {abs _pitch > 180} do {_pitch = _sign*(abs _pitch - 180)};
+while {abs _pitch > 180} do {_pitch = _sign*((abs _pitch) - 180)};
 
 //we can't use pitch that is exactly equal to 90, because then the engine doesn't know what 2d compass direction the object is facing
 if(abs _pitch == 90) then {_pitch = _sign*(89.9)};
@@ -102,7 +102,7 @@ _vdir = [_vdir, _yaw] call _rotate;
 _sign = [1,-1] select (_bank < 0);
 
 //cut off numbers above 360
-while {abs _bank > 360} do {_bank = _sign*(abs _bank - 360)};
+while {abs _bank > 360} do {_bank = _sign*((abs _bank) - 360)};
 
 //reflect numbers above 180
 if(abs _bank > 180) then {_sign = -1*_sign; _bank = (360-_bank)*_sign};

dayz_code/compile/fn_sunRise.sqf

@@ -14,7 +14,7 @@
 	Reference:
 	http://forums.bistudio.com/showthread.php?107476-How-do-I-detect-sundown-sunrise
 */
-private ["_lat", "_day", "_hour"];
+private ["_lat","_day","_hour","_daytime"];
 _lat = -1 * getNumber(configFile >> "CfgWorlds" >> worldName >> "latitude");
 _day = 360 * (dateToNumber date);
 _hour = acos ((24 * sin(_lat) * cos(_day)) / ((12 * cos(_day) - 78) * cos(_lat)));

dayz_code/compile/fn_surfaceNoise.sqf

@@ -1,5 +1,5 @@
 //Assess Terrain
-private["_unit","_pos","_type","_typeA","_soundType","_soundVal","_array","_test"];
+private ["_unit","_pos","_type","_typeA","_soundType","_soundVal","_array"];
 _unit = 	_this;
 _pos = 		getPosATL _unit;
 _type = 	surfaceType _pos;
@@ -7,7 +7,7 @@ _typeA = 	toArray _type;
 _typeA 		set [0,"DEL"];
 _typeA = 	_typeA - ["DEL"];
 _type = 	toString _typeA;
-_test = 	0;
+// _test = 	0;
 
 //diag_log ("FINDME: " + _type);
 

dayz_code/compile/fn_temperatur.sqf

@@ -19,7 +19,7 @@ Missing:
 */
 
 
-	private ["_looptime","_sun_factor","_building_factor","_vehicle_factor","_fire_factor","_water_factor","_rain_factor","_night_factor","_wind_factor","_height_mod","_difference","_hasfireffect","_isinbuilding","_isinvehicle","_raining","_sunrise","_building"];
+	private ["_looptime","_sun_factor","_building_factor","_vehicle_factor","_fire_factor","_water_factor","_rain_factor","_night_factor","_wind_factor","_height_mod","_difference","_isinbuilding","_isinvehicle","_raining","_sunrise","_building","_fireplaces","_daytime","_temp","_moving_factor"];
 
 	_looptime 			= _this;
 	
@@ -38,7 +38,7 @@ Missing:
 	_wind_factor		=	-1;
 	
 	_difference 	= 0;
-	_hasfireffect	= false;
+	// _hasfireffect	= false;
 	_isinbuilding	= false;
 	_isinvehicle	= false;
 	
@@ -65,7 +65,7 @@ Missing:
 	if(({inflamed _x} count _fireplaces) > 0 && !_isinvehicle ) then {
 		//Math: factor * 1 / (0.5*(distance max 1)^2) 		0.5 = 12.5% of the factor effect in a distance o 4 meters
 		_difference 	= _difference + (_fire_factor /(0.5*((player distance (_fireplaces select 0)) max 1)^2));
-		_hasfireffect 	= true;
+		//_hasfireffect 	= true;
 	};
 	
 	//building
@@ -98,12 +98,12 @@ Missing:
 		s = sunrise
 		d = daytime
 		
-		I:	a = f / (12 - s)<29>
+		I:	a = f / (12 - s)<29>
-		II:	t = -a * (d - 12)<29> + f
+		II:	t = -a * (d - 12)<29> + f
 		
 		I + II =>
 		
-		t = -(f / (12 - s)<29>) * (d - 12)<29> + f
+		t = -(f / (12 - s)<29>) * (d - 12)<29> + f
 		
 		Parabel with highest Point( greatest Effect == _sun_factor) always at 12.00
 		Zero Points are always at sunrise and sunset -> Only Positiv Values Possible

dayz_code/compile/fn_unconscious.sqf

@@ -1,3 +1,4 @@
+private ["_timeout","_isOnDeck","_isInLocation","_inVehicle","_bloodLow","_isHospital","_totalTimeout","_display","_ctrl1","_ctrl1Pos"];
 disableSerialization;
 if ((!r_player_handler1) and (r_handlerCount == 0)) then {
 	//Unconscious Meter
@@ -25,7 +26,7 @@ if ((!r_player_handler1) and (r_handlerCount == 0)) then {
 		sleep 1;
 		_isOnDeck = false; //getPos player in LHA_Deck;
 		_isInLocation = false; //getPos player in LHA_Location;
-		_inVehicle = (vehicle _unit != _unit);
+		_inVehicle = (vehicle player != player);
 		_bloodLow = ((r_player_blood/r_player_bloodTotal) < 0.5);
 		if ((surfaceIsWater (getPosASL player)) and !_isOnDeck and !_inVehicle) then {
 			player setpos [(getPosASL player select 0),(getPosASL player select 1),0.3];

dayz_code/compile/fnc_MapEventHandler.sqf

@@ -1,33 +1,31 @@
-
+private ["_markerstr","_class","_name","_type","_position","_radiusA","_radiusB","_maptype","_config"];
-if ("ItemMap_Debug" in items player) then {
+
-	_world = toUpper(worldName);
+if ("ItemMap_Debug" in items player) then {
-	_maptype = ["NameCityCapital","NameCity","NameVillage","NameLocal"];	
+	// _world = toUpper(worldName);
-	_config = configFile >> "CfgWorlds" >> worldName >> "Names";
+
- 
+	_maptype = ["NameCityCapital","NameCity","NameVillage","NameLocal"];	
-	for "_i" from 0 to (count _config -1) do {
+
-		_class = _config select _i; //Returns a conif
+	_config = configFile >> "CfgWorlds" >> worldName >> "Names";
-		_name = 		getText (_class >> "name");
+
-		_type = 		getText (_class >> "type");
+ 
-		_position = 	getArray (_class >> "position");
+
-		_radiusA = 		getNumber (_class >> "radiusA");
+	for "_i" from 0 to (count _config -1) do {
-		_radiusB = 		getNumber (_class >> "radiusB");
+
-		
+		_class = _config select _i; //Returns a conif
-
+
-		if (_type in _maptype) then {
+		_name = 		getText (_class >> "name");
-		diag_log(format["Config Type, Name: %1 / Type: %2 / Position: %3, Passed",_name,_type,_position]);
+
-	//		_rnd = random 1;
+		_type = 		getText (_class >> "type");
-	//		_chance = 0.6;
+
-	//		if (_rnd < _chance) then {
+		_position = 	getArray (_class >> "position");
-				_markerstr = createMarkerLocal ["markername_" +str (_name), _position];
+
-				_markerstr setMarkerTextLocal _name;
+		_radiusA = 		getNumber (_class >> "radiusA");
-				_markerstr setMarkerColorLocal "ColorGreen";
+
-				_markerstr setMarkerShapeLocal "ELLIPSE";
+		_radiusB = 		getNumber (_class >> "radiusB");
-				_markerstr setMarkerBrushLocal "Grid";
+
-				_markerstr setMarkerSizeLocal [_radiusA, _radiusB];	
+		
-	//		};
+
-		};	
+
-	};
+
-};
+		if (_type in _maptype) then {
-
+
-
-

dayz_code/compile/local_gutObjectZ.sqf

@@ -1,6 +1,6 @@
-private["_zombiebody","_qty","_type","_meat","_loop"];
+private ["_zombiebody","_ehLoc"];
 _zombiebody = _this select 0;
-_qty = _this select 1;
+// _qty = _this select 1;
 
 if (local _zombiebody) then {
 	_zombiebody addMagazine "ItemZombieParts";

dayz_code/compile/object_cargoCheck.sqf

@@ -1,4 +1,4 @@
-private["_currentObjects","_currentTypes","_currentQty","_previousTypes","_previousQty","_serial","_itemVal","_itemQty","_oldSerial","_oldQty"];
+private ["_currentObjects","_currentTypes","_currentQty","_previousTypes","_previousQty","_serial","_itemVal","_itemQty","_oldSerial","_oldQty","_change","_checkObjects"];
 //_newObjects = [_previous,weapons player] call player_weaponCheck;
 _currentObjects = 	_this select 0;
 _checkObjects = 	_this select 1;

dayz_code/compile/object_processHit.sqf

@@ -1,4 +1,4 @@
-private["_unit","_hp","_selection","_strH","_dam","_display"];
+private ["_unit","_selection","_strH","_dam","_display","_id","_break","_ctrlFracture","_total","_damage"];
 disableSerialization;
 _unit =			_this select 0;
 _selection =	_this select 1;

dayz_code/compile/object_roadFlare.sqf

@@ -1,11 +1,11 @@
-private["_flare","_sfx","_isLocal","_lightArea","_lightSpark","_type","_color"];
+private ["_flare","_lightArea","_lightSpark","_type","_color"];
 _flare = _this select 0;
 _type = _this select 1;
-_sfx = objNull;
+//_sfx = objNull;
 if (!isNull _flare) then {
 	switch (_type) do {
 		case 0: {
-			_isLocal = local _flare;
+			//_isLocal = local _flare;
 			//Area Light
 			_lightArea = "#lightpoint" createVehicleLocal (getPosATL _flare);
 			_lightArea setLightColor [0.5,0,0]; //[0.1,0.005,0.005];

dayz_code/compile/object_setFixServer.sqf

@@ -1,4 +1,4 @@
-private["_unit","_selection","_strH","_damage","_total"];
+private ["_unit","_selection","_strH","_damage"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;

dayz_code/compile/object_setHit.sqf

@@ -1,4 +1,4 @@
-private["_unit","_selection","_strH","_dam"];
+private ["_unit","_selection","_strH","_dam"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;
@@ -10,4 +10,4 @@ if (_selection != "") then {
 		_unit setHit[_selection,(_dam + _damage)];
 	};
 };
-_damage
+_damage;

dayz_code/compile/object_setHitLocal.sqf

@@ -1,4 +1,4 @@
-private["_unit","_selection","_strH","_dam","_total"];
+private ["_unit","_selection","_strH","_dam","_total"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;
@@ -13,4 +13,4 @@ if ((_selection != "")) then {
 } else {
 	_damage = 0;
 };
-_damage
+_damage;

dayz_code/compile/object_speak.sqf

@@ -1,4 +1,4 @@
-private["_unit","_type","_chance","_rnd","_sound","_local","_dis"];
+private ["_unit","_type","_chance","_rnd","_sound","_local","_dis","_num","_isWoman"];
 _unit = _this select 0;
 _type = _this select 1;
 _chance = _this select 2;

dayz_code/compile/object_vehicleKilled.sqf

@@ -1,9 +1,9 @@
-private["_unit","_killer","_type","_pos","_dir"];
+private ["_unit"];
 _unit =			_this select 0;
-_killer =		_this select 1;
+//_killer =		_this select 1;
-_type = typeOf _unit;
+//_type = typeOf _unit;
-_pos = getposATL _unit;
+//_pos = getposATL _unit;
-_dir = direction _unit;
+//_dir = direction _unit;
 if (local _unit) then {
 	deleteVehicle _unit;
 };

dayz_code/compile/player_alertZombies.sqf

@@ -1,4 +1,4 @@
-private["_unit","_distance","_i","_listTalk","_zombie","_targets","_pos"];
+private ["_unit","_distance","_listTalk","_zombie","_targets","_pos","_doRun"];
 //Alert Zed's to noise of shot
 _unit = 	_this select 0;
 _distance = _this select 1;

dayz_code/compile/player_animalCheck.sqf

@@ -1,5 +1,5 @@
 
-private["_list","_animalssupported","_type","_root","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_agent","_id","_pos","_near"];
+private ["_list","_animalssupported","_type","_root","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_agent","_id"];
 _list = getposATL player nearEntities [["CAAnimalBase"],dayz_animalDistance];
 
 if (count _list < dayz_maxAnimals) then {

dayz_code/compile/player_checkStealth.sqf

@@ -1,11 +1,11 @@
-private["_lightOn","_vel","_speed","_pos","_scalePose","_scaleMvmt","_scaleLight","_scaleAlert","_anim","_anim4","_initial","_scaleSound","_nearFlare","_scaler","_nearLight","_nearFire","_building","_isPlayerInside","_audial"];
+private ["_vel","_speed","_pos","_scalePose","_scaleMvmt","_scaleLight","_anim","_anim4","_initial","_scaleSound","_nearFlare","_scaler","_nearLight","_nearFire","_building","_isPlayerInside","_audial","_isWater","_isPZombie"];
 _vel = velocity (vehicle player);
 _speed = (_vel distance [0,0,0]);
 _pos = getPosATL player;
 _scalePose = 0.9;
 _scaleMvmt = 0.2;	//0.4;
 _scaleLight = 0.5;
-_scaleAlert = 1;
+// _scaleAlert = 1;
 
 _isPZombie = player isKindOf "PZombie_VB";
 if(_isPZombie) exitWith { DAYZ_disAudial = 0; DAYZ_disVisual = 0; };

dayz_code/compile/player_crossbowBolt.sqf

@@ -1,4 +1,4 @@
-private["_unit","_ammo","_audible","_distance","_listTalk","_weapon","_projectile","_vUp","_endPos","_dir","_height","_bolt","_hitArray","_hitObject","_hitSelection","_config","_hitMemoryPt","_variation","_val","_doLoop","_countr"];
+private ["_unit","_ammo","_distance","_weapon","_projectile","_vUp","_endPos","_dir","_height","_bolt","_hitArray","_hitObject","_hitSelection","_config","_hitMemoryPt","_variation","_val","_doLoop","_countr","_magazine"];
 _unit = 		_this select 0;
 _weapon = 		_this select 1;
 _ammo = 		_this select 4;

dayz_code/compile/player_death.sqf

@@ -1,4 +1,4 @@
-private["_array","_source","_kills","_killsV","_humanity","_wait","_myKills","_infected"];
+private ["_array","_source","_kills","_killsV","_humanity","_wait","_myKills","_infected","_canHitFree","_myHumanity","_method","_body","_playerID","_id","_myGroup"];
 if (deathHandled) exitWith {};
 
 deathHandled = true;

dayz_code/compile/player_fired.sqf

@@ -1,4 +1,4 @@
-private["_unit","_ammo","_audible","_distance","_listTalk","_weapon"];
+private ["_unit","_ammo","_audible","_distance","_listTalk","_weapon","_group","_targets","_i","_projectile","_id","_caliber"];
 //[unit, weapon, muzzle, mode, ammo, magazine, projectile]
 _unit = 		_this select 0;
 _weapon = 		_this select 1;

dayz_code/compile/player_friendliesCheck.sqf

@@ -1,4 +1,4 @@
-private["_charID", "_friendlies", "_rcharID", "_rfriendlyTo", "_tag", "_player", "_newTagList"];
+private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList"];
 _charID = player getVariable ["characterID", "0"];
 _friendlies = player getVariable ["friendlies", []];
 _tagList = player getVariable ["tagList", []];

dayz_code/compile/player_gearSet.sqf

@@ -1,4 +1,4 @@
-private["_inventory","_wpns","_mags","_idc","_isOK","_val","_item","_x"];
+private ["_inventory","_wpns","_mags","_idc","_isOK"];
 _inventory = _this;
 if (count _inventory > 0) then {
 	_wpns = _inventory select 0;

dayz_code/compile/player_humanityChange.sqf

@@ -1,4 +1,4 @@
-private["_object","_change","_humanity","_timeStart"];
+private ["_object","_change","_humanity","_wait"];
 //Set Variables
 _object = _this select 0;
 _change = _this select 1;
@@ -14,7 +14,7 @@ if (_object == player) then {
 			waitUntil{!(player getVariable ["freeTarget",false])};
 		};
 		player setVariable ["freeTarget",true,true];
-		_timeStart = time;
+		//_timeStart = time;
 		sleep _wait;
 		player setVariable ["freeTarget",false,true];
 		

dayz_code/compile/player_humanityMorph.sqf

@@ -1,4 +1,4 @@
-private["_updates","_playerUID","_charID","_humanity","_worldspace","_model","_friendlies"];
+private ["_updates","_playerUID","_charID","_humanity","_worldspace","_model","_friendlies","_fractures","_old","_medical","_zombieKills","_headShots","_humanKills","_banditKills","_tagList"];
 _playerUID 	= _this select 0;
 _charID 	= _this select 1;
 _model 		= _this select 2;

dayz_code/compile/player_login.sqf

@@ -1,4 +1,4 @@
-private["_unit","_move","_damage","_wound","_sound","_local","_dir","_hpList","_hp","_strH","_dam","_total","_result","_vehicle"];
+private ["_unit","_detail"];
 _unit = _this select 0;
 _detail = _this select 1;
 if(_unit == getPlayerUID player) then {

dayz_code/compile/player_music.sqf

@@ -1,4 +1,4 @@
-private["_zombie","_type","_chance","_rnd","_sound"];
+private ["_sound","_num","_length","_pause"];
 while {!r_player_dead} do {
 	_num = round(random 35);
 	_sound = "z_suspense_" + str(_num);

dayz_code/compile/player_onPause.sqf

@@ -1,4 +1,4 @@
-private["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax","_isDead"];
+private ["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax"];
 		disableSerialization;
 		waitUntil {
 			_display = findDisplay 49;
@@ -24,7 +24,7 @@ private["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax","_isDead"];
 			switch true do {
 				case ({isPlayer _x} count (player nearEntities ["AllVehicles", 6]) > 1) : {
 					_btnAbort ctrlEnable false;
-					cutText [format[localize "str_abort_playerclose",_text], "PLAIN DOWN"];
+					cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
 				};
 				case (_timeOut < _timeMax && count (player nearEntities ["zZombie_Base", 35]) > 0) : {
 					_btnAbort ctrlEnable false;
@@ -38,7 +38,7 @@ private["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax","_isDead"];
 				case (player getVariable["combattimeout", 0] >= time) : {
 					_btnAbort ctrlEnable false;
 					//cutText ["Cannot Abort while in combat!", "PLAIN DOWN"];
-					cutText [format[localize "str_abort_playerincombat",_text], "PLAIN DOWN"];					
+					cutText [localize "str_abort_playerincombat", "PLAIN DOWN"];					
 				};
 				default {
 					_btnAbort ctrlEnable true;

dayz_code/compile/player_packTent.sqf

@@ -1,7 +1,7 @@
 /*
 [_obj] spawn player_packTent;
 */
-private["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr"];
+private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_dis","_sfx","_classname","_location"];
 
 if(TradeInprogress) exitWith { cutText ["Pack tent already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;

dayz_code/compile/player_projectileNear.sqf

@@ -1,10 +1,10 @@
-private["_unit","_projectile","_isInCombat"];
+private ["_unit","_projectile","_isInCombat","_currentNear","_projectilespeed","_projectflight","_listNear","_callCount","_nearVehicle"];
 _unit =         _this select 0;
 _projectile = 	_this select 6;
 
 diag_log ("0");
 
-_isInComat = _unit getVariable["startcombattimer",0];
+//_isInComat = _unit getVariable["startcombattimer",0];
 
 diag_log ("Bullit Speed: " +str(Speed _projectile));
 diag_log ("Bullit Velocity: " +str(velocity _projectile));