W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update compiles.sqf

Browse Source 
- Update private tags
- Pre-compile Door and Plot Management functions only if they are used
This commit is contained in:
A Man
2020-04-07 11:55:50 +02:00
parent 49355260fa
commit dfe80e75c4
1 changed files with 93 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
SQF/dayz_code/init/compiles.sqf
View File

@@ -66,10 +66,10 @@ if (!isDedicated) then {
//Zombies //Zombies
zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf"; zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf";
//player_zombieSwarmAttack = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_zombieSwarmAttack.sqf";
zombie_loiter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_loiter.sqf"; //Server compile, used for loiter behaviour zombie_loiter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_loiter.sqf"; //Server compile, used for loiter behaviour
zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviours zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviours
//zombie_generateSwarm = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\swarm_generate.sqf"; //zombie_generateSwarm = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\swarm_generate.sqf";
//player_zombieSwarmAttack = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_zombieSwarmAttack.sqf";
// Medical // Medical
player_medBandage = compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf"; player_medBandage = compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf";
@@ -92,7 +92,6 @@ if (!isDedicated) then {
player_attachAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_attachAttachment.sqf"; player_attachAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_attachAttachment.sqf";
player_removeAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_removeAttachment.sqf"; player_removeAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_removeAttachment.sqf";
player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf"; player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf";
//player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
player_mineStone = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineStone.sqf"; player_mineStone = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineStone.sqf";
if (DZE_modularBuild) then { if (DZE_modularBuild) then {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf"; player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf";
@@ -105,34 +104,35 @@ if (!isDedicated) then {
}; };
FNC_find_plots = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_find_plots.sqf"; FNC_find_plots = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_find_plots.sqf";
//player_buildVanilla = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildVanilla.sqf";
//player_buildPlaceables = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildPlaceables.sqf";
//fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
//object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf";
//object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf"; player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf"; player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf";
object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf"; object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";
//player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf";
player_combineMag = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineMags.sqf"; player_combineMag = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineMags.sqf";
player_combineAntibiotics = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineAntibiotics.sqf"; player_combineAntibiotics = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineAntibiotics.sqf";
player_combinePainkiller = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combinePainkiller.sqf"; player_combinePainkiller = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combinePainkiller.sqf";
player_combineMatches = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineMatches.sqf"; player_combineMatches = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineMatches.sqf";
player_createquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_createQuiver.sqf"; player_createquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_createQuiver.sqf";
player_fillquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fillQuiver.sqf"; player_fillquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fillQuiver.sqf";
//player_takearrow = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_takeArrow.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf";
//player_goFishing = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_goFishing.sqf";
player_gather = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_gather.sqf"; player_gather = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_gather.sqf";
player_tearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_tearClothes.sqf"; player_tearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_tearClothes.sqf";
//object_remove = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf";
player_fixHatchet = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fixTools.sqf"; player_fixHatchet = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fixTools.sqf";
player_sharpen = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sharpen.sqf"; player_sharpen = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sharpen.sqf";
player_butcher = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\gather_meat.sqf"; player_butcher = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\gather_meat.sqf";
player_pushPlane = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_pushPlane.sqf"; player_pushPlane = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_pushPlane.sqf";
//player_repairVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\repair_vehicle.sqf"; //player_repairVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\repair_vehicle.sqf";
//player_salvageVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\salvage_vehicle.sqf"; //player_salvageVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\salvage_vehicle.sqf";
//player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
//player_buildVanilla = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildVanilla.sqf";
//player_buildPlaceables = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildPlaceables.sqf";
//fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
//object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf";
//object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
//player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf";
//player_takearrow = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_takeArrow.sqf";
//player_goFishing = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_goFishing.sqf";
//object_remove = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf";
//ui //ui
player_toggleSoundMute = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleSoundMute.sqf"; player_toggleSoundMute = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleSoundMute.sqf";
@@ -200,19 +200,23 @@ if (!isDedicated) then {
player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf"; player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf";
player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf"; player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf";
player_upgradeVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf"; player_upgradeVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf";
PlotGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotGetFriends.sqf"; if (DZE_permanentPlot) then {
PlotNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotNearbyHumans.sqf"; PlotGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotGetFriends.sqf";
PlotAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotAddFriend.sqf"; PlotNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotNearbyHumans.sqf";
PlotRemoveFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotRemoveFriend.sqf"; PlotAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotAddFriend.sqf";
PlotObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotObjects.sqf"; PlotRemoveFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotRemoveFriend.sqf";
PlotPreview = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotToggleMarkers.sqf"; PlotObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotObjects.sqf";
PlotPreview = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotToggleMarkers.sqf";
};
if (DZE_doorManagement) then {
DoorGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorGetFriends.sqf";
DoorNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorNearbyHumans.sqf";
DoorAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorAddFriend.sqf";
DoorRemoveFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorRemoveFriend.sqf";
player_manageDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\initDoorManagement.sqf";
player_enterCode = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\player_enterCode.sqf";
};
MaintainPlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\maintain_area.sqf"; MaintainPlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\maintain_area.sqf";
DoorGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorGetFriends.sqf";
DoorNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorNearbyHumans.sqf";
DoorAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorAddFriend.sqf";
DoorRemoveFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorRemoveFriend.sqf";
player_manageDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\initDoorManagement.sqf";
player_enterCode = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\player_enterCode.sqf";
FNC_check_access = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_check_access.sqf"; FNC_check_access = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_check_access.sqf";
fnc_usec_damageHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandler.sqf"; //Event handler run on damage fnc_usec_damageHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandler.sqf"; //Event handler run on damage
if (DZE_SnowFall) then { if (DZE_SnowFall) then {
@@ -237,7 +241,7 @@ if (!isDedicated) then {
}; };
ui_initDisplay = { ui_initDisplay = {
private ["_ctrlBleed","_ctrlFracture"]; private ["_ctrlBleed","_ctrlFracture","_display","_control"];
disableSerialization; disableSerialization;
_display = uiNamespace getVariable 'DAYZ_GUI_display'; _display = uiNamespace getVariable 'DAYZ_GUI_display';
_control = _display displayCtrl 1204; _control = _display displayCtrl 1204;
@@ -246,7 +250,7 @@ if (!isDedicated) then {
_ctrlBleed = _display displayCtrl 1303; _ctrlBleed = _display displayCtrl 1303;
_ctrlBleed ctrlShow false; _ctrlBleed ctrlShow false;
}; };
if (!r_fracture_legs && !r_fracture_arms) then { if (!r_fracture_legs && {!r_fracture_arms}) then {
_ctrlFracture = _display displayCtrl 1203; _ctrlFracture = _display displayCtrl 1203;
_ctrlFracture ctrlShow false; _ctrlFracture ctrlShow false;
}; };
@@ -264,7 +268,7 @@ if (!isDedicated) then {
}; };
dayz_angleCheck = { dayz_angleCheck = {
private ["_degree","_tPos","_zPos","_inAngle"]; private ["_degree","_tPos","_zPos","_inAngle","_agent","_target","_eyeDir"];
_target = _this select 0; _target = _this select 0;
_agent = _this select 1; _agent = _this select 1;
_degree = _this select 2; _degree = _this select 2;
@@ -282,11 +286,11 @@ if (!isDedicated) then {
_agent = _this select 1; _agent = _this select 1;
_cantSee = true; _cantSee = true;
if ((!isNull _target) && (!isNull _agent)) then { if ((!isNull _target) && {!isNull _agent}) then {
private ["_tPos","_zPos"]; private ["_tPos","_zPos"];
_tPos = eyePos _target; _tPos = eyePos _target;
_zPos = eyePos _agent; _zPos = eyePos _agent;
if ((count _tPos > 0) && (count _zPos > 0)) then { if ((count _tPos > 0) && {count _zPos > 0}) then {
_cantSee = terrainIntersectASL [(eyePos _target), (eyePos _agent)]; _cantSee = terrainIntersectASL [(eyePos _target), (eyePos _agent)];
//diag_log ("terrainIntersectASL: " + str(_cantSee)); //diag_log ("terrainIntersectASL: " + str(_cantSee));
@@ -300,7 +304,7 @@ if (!isDedicated) then {
}; };
dayz_NutritionSystem = { dayz_NutritionSystem = {
private ["_type","_baseRegen","_nutrition","_calorieCount","_hungerCount","_thirstCount","_tempCount","_Thirst","_Hunger","_bloodregen","_golbalNutrition"]; private ["_type","_baseRegen","_nutrition","_calorieCount","_hungerCount","_thirstCount","_tempCount"];
//["type",regen,[NutritionTable,thirst(Working Class),hunger(Working Class)]] //["type",regen,[NutritionTable,thirst(Working Class),hunger(Working Class)]]
//info to be added //info to be added
_type = _this select 0; _type = _this select 0;
@@ -308,11 +312,11 @@ if (!isDedicated) then {
_nutrition = _this select 2; _nutrition = _this select 2;
//Nutrition array //Nutrition array
_calorieCount = ((_this select 2) select 0); _calorieCount = _nutrition select 0;
//gain //gain
_hungerCount = ((_this select 2) select 1); _hungerCount = _nutrition select 1;
_thirstCount = ((_this select 2) select 2); _thirstCount = _nutrition select 2;
_tempCount = ((_this select 2) select 3); _tempCount = _nutrition select 3;
//3610 is based on a 80kg male 180cm tall //3610 is based on a 80kg male 180cm tall
if (_calorieCount > 0) then { if (_calorieCount > 0) then {
@@ -320,8 +324,8 @@ if (!isDedicated) then {
_thirstCount = _thirstCount + (SleepWater * (((ln ((_calorieCount / 3610) * 100)) * (1 - (dayz_thirst / SleepWater))) / 100)); _thirstCount = _thirstCount + (SleepWater * (((ln ((_calorieCount / 3610) * 100)) * (1 - (dayz_thirst / SleepWater))) / 100));
}; };
switch (_type) do { call {
case "FoodDrink": { if (_type == "FoodDrink") exitwith {
//hunger //hunger
if (_hungerCount > 0) then { if (_hungerCount > 0) then {
if (dayz_hunger > _hungerCount) then { if (dayz_hunger > _hungerCount) then {
@@ -346,7 +350,7 @@ if (!isDedicated) then {
if (_baseRegen > 0) then { r_player_bloodregen = r_player_bloodregen + _baseRegen; }; if (_baseRegen > 0) then { r_player_bloodregen = r_player_bloodregen + _baseRegen; };
}; };
case "Working": { if (_type == "Working") exitwith {
if (_calorieCount > 0) then { dayz_nutrition = dayz_nutrition - (_calorieCount / ((DZE_NutritionDivisor select 0) max 0.1)); }; if (_calorieCount > 0) then { dayz_nutrition = dayz_nutrition - (_calorieCount / ((DZE_NutritionDivisor select 0) max 0.1)); };
if (_thirstCount > 0) then { dayz_thirst = dayz_thirst + (_thirstCount / ((DZE_NutritionDivisor select 1) max 0.1)); }; if (_thirstCount > 0) then { dayz_thirst = dayz_thirst + (_thirstCount / ((DZE_NutritionDivisor select 1) max 0.1)); };
if (_hungerCount > 0) then { dayz_hunger = dayz_hunger + (_hungerCount / ((DZE_NutritionDivisor select 2) max 0.1)); }; if (_hungerCount > 0) then { dayz_hunger = dayz_hunger + (_hungerCount / ((DZE_NutritionDivisor select 2) max 0.1)); };
@@ -421,7 +425,7 @@ if (!isDedicated) then {
}; };
gear_ui_init = { gear_ui_init = {
//private["_control","_parent","_menu","_grpPos"]; private["_control","_parent","_menu","_grpPos"];
disableSerialization; disableSerialization;
_parent = findDisplay 106; _parent = findDisplay 106;
_control = _parent displayCtrl 6902; _control = _parent displayCtrl 6902;
@@ -437,7 +441,7 @@ if (!isDedicated) then {
}; };
gear_ui_hide = { gear_ui_hide = {
//private["_display","_BP"]; private["_display","_BP"];
disableSerialization; disableSerialization;
_display = findDisplay 106; _display = findDisplay 106;
_BP = unitBackpack player; _BP = unitBackpack player;
@@ -459,20 +463,20 @@ if (!isDedicated) then {
(_display displayCtrl 158) ctrlShow false; (_display displayCtrl 158) ctrlShow false;
}; };
if ((DZE_TwoPrimaries == 0) && {(primaryWeapon player == "" && dayz_onBack != "" && !(dayz_onBack in MeleeWeapons))}) then { if ((DZE_TwoPrimaries == 0) && {primaryWeapon player == "" && {dayz_onBack != ""} && {!(dayz_onBack in MeleeWeapons)}}) then {
//["gear"] call player_switchWeapon; //["gear"] call player_switchWeapon;
0 call dz_fn_switchWeapon; 0 call dz_fn_switchWeapon;
closeDialog 0; closeDialog 0;
}; };
if ((DZE_TwoPrimaries == 1) && {(primaryWeapon player != "" && dayz_onBack != "" && (!(dayz_onBack in MeleeWeapons)) && !(primaryWeapon player in MeleeWeapons))}) then { if ((DZE_TwoPrimaries == 1) && {primaryWeapon player != "" && {dayz_onBack != ""} && {!(dayz_onBack in MeleeWeapons)} && {!(primaryWeapon player in MeleeWeapons)}}) then {
//["gear"] call player_switchWeapon; //["gear"] call player_switchWeapon;
0 call dz_fn_switchWeapon; 0 call dz_fn_switchWeapon;
closeDialog 0; closeDialog 0;
}; };
if ((DZE_TwoPrimaries == 0) && primaryWeapon player != "" && (primaryWeapon player in MeleeWeapons || dayz_onBack in MeleeWeapons)) then { if ((DZE_TwoPrimaries == 0) && {primaryWeapon player != ""} && {primaryWeapon player in MeleeWeapons || dayz_onBack in MeleeWeapons}) then {
(_display displayCtrl 1204) ctrlShow true; (_display displayCtrl 1204) ctrlShow true;
} else { } else {
if ((DZE_TwoPrimaries > 0) && (primaryWeapon player != "")) then { if ((DZE_TwoPrimaries > 0) && {primaryWeapon player != ""}) then {
(_display displayCtrl 1204) ctrlShow true; (_display displayCtrl 1204) ctrlShow true;
} else { } else {
(_display displayCtrl 1204) ctrlShow false; (_display displayCtrl 1204) ctrlShow false;
@@ -491,7 +495,7 @@ if (!isDedicated) then {
}; };
dayz_lowHumanity = { dayz_lowHumanity = {
//private["_unit","_humanity","_delay"]; private "_unit";
_unit = _this; _unit = _this;
if ((_unit distance player) < 15) then { if ((_unit distance player) < 15) then {
private "_humanity"; private "_humanity";
@@ -516,7 +520,7 @@ if (!isDedicated) then {
}; };
dayz_meleeMagazineCheck = { dayz_meleeMagazineCheck = {
//private["_meleeNum","_magType","_wpnType","_ismelee"]; private["_wpnType","_ismelee"];
_wpnType = primaryWeapon player; _wpnType = primaryWeapon player;
_ismelee = (getNumber (configFile >> "CfgWeapons" >> _wpnType >> "melee") == 1); _ismelee = (getNumber (configFile >> "CfgWeapons" >> _wpnType >> "melee") == 1);
if (_ismelee) then { if (_ismelee) then {
@@ -639,7 +643,7 @@ if (!isDedicated) then {
if (_x in items player) exitWith { _hasTool = true; }; if (_x in items player) exitWith { _hasTool = true; };
} count DayZ_Ignitors; } count DayZ_Ignitors;
}; };
_ret = (_whatIwant && !_islit && _hasTool) or (!_whatIwant && _isLit); _ret = (_whatIwant && {!_islit} && {_hasTool}) or (!_whatIwant && {_isLit});
_ret _ret
}; };
@@ -807,7 +811,7 @@ dayz_inflame = {
}; };
dayz_inflame_other = { dayz_inflame_other = {
private ["_fireplace","_ret","_flame","_islit","_isLit","_pos"]; private ["_fireplace","_flame","_pos"];
_fireplace = _this select 0; _fireplace = _this select 0;
if (_this select 1) then { // true = light the fire if (_this select 1) then { // true = light the fire
@@ -842,7 +846,7 @@ isInflamed = {
}; };
dayz_engineSwitch = { dayz_engineSwitch = {
//private["_unit","_humanity","_delay"]; private["_vehicle","_state"];
_vehicle = _this select 0; _vehicle = _this select 0;
_state = _this select 1; _state = _this select 1;