W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-07-04 23:51:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some issues with traps

Browse Source 
Removed two unused files.

Vanilla commits:

https://github.com/DayZMod/DayZ/commit/42e72463a3f3722ad974d50a093b4f57edbf8c00

https://github.com/DayZMod/DayZ/commit/02726fb1923a7354121796a0e306a8ca92cdc42f

https://github.com/DayZMod/DayZ/commit/6a7c53ebcf48f6e552bf4d5bb65be07792a0cd92

https://github.com/DayZMod/DayZ/commit/1fb6308995584472b0494a54d211dc5b216bfd98

https://github.com/DayZMod/DayZ/commit/9543ea057f97ba6f1105f6abecaa04e1fe5d4457
This commit is contained in:
ebayShopper
2017-03-20 15:53:35 -04:00
parent 100f9f5da8
commit e38f47375c
20 changed files with 111 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQF/dayz_server/system/scheduler/sched_init.sqf
-2
View File
@@ -6,7 +6,6 @@ call compile preprocessFileLineNumbers (_base+"sched_lootpiles.sqf");
//call compile preprocessFileLineNumbers (_base+"sched_playersHivesync.sqf");
//call compile preprocessFileLineNumbers (_base+"sched_vehiclesHivesync.sqf");
call compile preprocessFileLineNumbers (_base+"sched_sync.sqf");
//call compile preprocessFileLineNumbers (_base+"sched_traps.sqf");
call compile preprocessFileLineNumbers (_base+"sched_safetyVehicle.sqf");
[
@@ -18,7 +17,6 @@ call compile preprocessFileLineNumbers (_base+"sched_safetyVehicle.sqf");
[ 6, 340, sched_lootpiles ],
[ 900, 0, sched_sync ],
[ 120, 48, sched_safetyVehicle ]
//[ 0.1, 1, sched_traps ]
] execFSM ("z\addons\dayz_code\system\scheduler\scheduler.fsm");
//diag_log [ __FILE__, "Scheduler started"];
SQF/dayz_server/system/scheduler/sched_traps.sqf
-33
View File
@@ -1,33 +0,0 @@
sched_traps = {
private ["_n","_x"];
// EVERY 5 SECONDS
// CHECK TRAPS STATE
if (!isNil "dayz_traps") then {
_n = 0;
{
if ((isNil "_x") OR {(isNull _x)}) then {
dayz_traps = dayz_traps - [_x];
}
else {
if (_x getVariable ["armed", false]) then {
if !(_x in dayz_traps_active) then {
["arm", _x] call compile getText (configFile >> "CfgVehicles" >> typeOf _x >> "script");
if !(_x in dayz_traps_active) then { dayz_traps_active set [ count dayz_traps_active, _x ]; };
_n = _n + 1;
};
} else {
if (_x in dayz_traps_active) then {
["disarm", _x] call compile getText (configFile >> "CfgVehicles" >> typeOf _x >> "script");
if (_x in dayz_traps_active) then { dayz_traps_active = dayz_traps_active - [_x]; };
_n = _n + 1;
};
};
};
} forEach dayz_traps;
if (_n > 0) then {
diag_log format ["%1: traps polling, changed %2 states", __FILE__, _n];
};
};
objNull
};