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

Fix errors when removing traps

Browse Source 
Vanilla commit:

b558351a06
This commit is contained in:
ebaydayz
2016-11-06 13:05:46 -05:00
parent 88691fe9d1
commit de46a173dc
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
View File

@@ -12,6 +12,7 @@ class BearTrap_DZ : TrapItems {
singleUse = 0;
nounderground = 0;
requireplot = 0;
constructioncount = 1;
class Eventhandlers {
init = "['init', _this select 0] spawn beartrap;";
@@ -124,6 +125,7 @@ class TrapBearTrapFlare : TrapItems {
vehicleClass = "Fortifications";
nounderground = 0;
requireplot = 0;
constructioncount = 1;
script = "beartrapflare"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state
@@ -175,6 +177,7 @@ class TrapBearTrapSmoke : TrapItems {
vehicleClass = "Fortifications";
nounderground = 0;
requireplot = 0;
constructioncount = 1;
script = "beartrapsmoke"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state
@@ -230,6 +233,7 @@ class Trap_Cans : TrapItems {
initState = 1; // initial armed state
singleUse = 0;
requireplot = 0;
constructioncount = 1;
class Eventhandlers {
init = "['init', _this select 0] spawn tripcans;";
@@ -281,6 +285,7 @@ class TrapTripwireFlare : TrapItems {
initState = 1; // initial armed state
singleUse = 0;
requireplot = 0;
constructioncount = 1;
class Eventhandlers {
init = "['init', _this select 0] spawn tripflare;";
@@ -332,6 +337,7 @@ class TrapTripwireGrenade : TrapItems {
initState = 1; // initial armed state
singleUse = 0;
requireplot = 0;
constructioncount = 1;
class Eventhandlers {
init = "['init', _this select 0] spawn tripgrenade;";
@@ -383,6 +389,7 @@ class TrapTripwireSmoke : TrapItems {
initState = 1; // initial armed state
singleUse = 0;
requireplot = 0;
constructioncount = 1;
class Eventhandlers {
init = "['init', _this select 0] spawn tripsmoke;";

12
SQF/dayz_code/traps/functions/remove.sqf
View File

@@ -1 +1,11 @@
[nil,nil,nil,_this select 0] call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf"
private ["_obj","_objectID","_objectUID"];
_obj = _this select 0;
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
if (isServer) then {
[_objectID,_objectUID,"__SERVER__"] call server_deleteObj;
} else {
[nil,nil,nil,_obj] execVM "\z\addons\dayz_code\actions\remove.sqf";
};