W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

added logging to swap object and changed to getPlayerUID

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-26 14:12:23 -06:00
parent e9e1164dc6
commit e92d212d16
17 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SQF/dayz_code/actions/list_playerDeaths.sqf
View File

@@ -1,23 +1,15 @@
private ["_activatingPlayer"]; private [];
// [ _trader_id, _category, _action ];
_activatingPlayer = player;
// attempt to remove newspaper if called without args // attempt to remove newspaper if called without args
if (count _this == 0) then { if (count _this == 0) then {
player removeMagazine "ItemNewspaper"; player removeMagazine "ItemNewspaper";
}; };
//diag_log format["DEBUG DEATH OBJ: %1", _this select 0]; PVDZE_plr_DeathB = [player];
//["PVDZE_plr_DeathB",[_activatingPlayer]] call callRpcProcedure;
PVDZE_plr_DeathB = [_activatingPlayer];
publicVariableServer "PVDZE_plr_DeathB"; publicVariableServer "PVDZE_plr_DeathB";
waitUntil {!isNil "PVDZE_plr_DeathBResult"}; waitUntil {!isNil "PVDZE_plr_DeathBResult"};
//diag_log format["DEBUG Death: %1", PVDZE_plr_DeathBResult];
if((count PVDZE_plr_DeathBResult) > 0) then { if((count PVDZE_plr_DeathBResult) > 0) then {
// load death message board ui // load death message board ui
call EpochDeathBoardLoad; call EpochDeathBoardLoad;

2
SQF/dayz_code/actions/player_buildingDowngrade.sqf
View File

@@ -134,7 +134,7 @@ if ((count _upgrade) > 0) then {
cutText [format[(localize "str_epoch_player_142"),_text], "PLAIN DOWN", 5]; cutText [format[(localize "str_epoch_player_142"),_text], "PLAIN DOWN", 5];
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID]; PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID,(getPlayerUID player)];
publicVariableServer "PVDZE_obj_Swap"; publicVariableServer "PVDZE_obj_Swap";
player reveal _object; player reveal _object;

2
SQF/dayz_code/actions/player_buildingMaint.sqf
View File

@@ -98,7 +98,7 @@ if (_proceed) then {
// Set location // Set location
_object setPosATL _location; _object setPosATL _location;
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID]; PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID,(getPlayerUID player)];
publicVariableServer "PVDZE_obj_Swap"; publicVariableServer "PVDZE_obj_Swap";
cutText [format[(localize "str_epoch_player_144"),_text], "PLAIN DOWN", 5]; cutText [format[(localize "str_epoch_player_144"),_text], "PLAIN DOWN", 5];

2
SQF/dayz_code/actions/player_upgrade.sqf
View File

@@ -164,7 +164,7 @@ if ((count _upgrade) > 0) then {
cutText [format[(localize "str_epoch_player_159"),_text], "PLAIN DOWN", 5]; cutText [format[(localize "str_epoch_player_159"),_text], "PLAIN DOWN", 5];
}; };
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID]; PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID,(getPlayerUID player)];
publicVariableServer "PVDZE_obj_Swap"; publicVariableServer "PVDZE_obj_Swap";
player reveal _object; player reveal _object;

2
SQF/dayz_code/actions/remove.sqf
View File

@@ -12,7 +12,7 @@ s_player_deleteBuild = 1;
_obj = _this select 3; _obj = _this select 3;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_objOwnerID = _obj getVariable["CharacterID","0"]; _objOwnerID = _obj getVariable["CharacterID","0"];
_isOwnerOfObj = (_objOwnerID == dayz_characterID); _isOwnerOfObj = (_objOwnerID == dayz_characterID);

2
SQF/dayz_code/actions/repair_vehicle.sqf
View File

@@ -1,7 +1,7 @@
private ["_part","_cancel","_color","_allFixed","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"]; private ["_part","_cancel","_color","_allFixed","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
// [ _trader_id, _category, _action ]; // [ _trader_id, _category, _action ];
// _activatingPlayer = player; // _activatingPlayer = getPlayerUID player;
_vehicle = _this select 3; _vehicle = _this select 3;

2
SQF/dayz_code/actions/salvage_vehicle.sqf
View File

@@ -1,7 +1,7 @@
private ["_part","_cancel","_color","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"]; private ["_part","_cancel","_color","_percent","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints"];
// [ _trader_id, _category, _action ]; // [ _trader_id, _category, _action ];
// _activatingPlayer = player; // _activatingPlayer = getPlayerUID player;
_vehicle = _this select 3; _vehicle = _this select 3;

2
SQF/dayz_code/actions/trade_any_bicycle.sqf
View File

@@ -9,7 +9,7 @@ TradeInprogress = true;
// [part_out,part_in, qty_out, qty_in, loc]; // [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_any_boat.sqf
View File

@@ -9,7 +9,7 @@ TradeInprogress = true;
// [part_out,part_in, qty_out, qty_in, loc]; // [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -9,7 +9,7 @@ TradeInprogress = true;
// [part_out,part_in, qty_out, qty_in, loc]; // [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_backpacks.sqf
View File

@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_clas
if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
TradeInprogress = true; TradeInprogress = true;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_items.sqf
View File

@@ -6,7 +6,7 @@ TradeInprogress = true;
_total_parts_out = 0; _total_parts_out = 0;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_items_wo_db.sqf
View File

@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut
if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
TradeInprogress = true; TradeInprogress = true;
//_activatingPlayer = player; //_activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/actions/trade_weapons.sqf
View File

@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_trad
if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
TradeInprogress = true; TradeInprogress = true;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_part_out = (_this select 3) select 0; _part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1; _part_in = (_this select 3) select 1;

2
SQF/dayz_code/compile/player_packTent.sqf
View File

@@ -9,7 +9,7 @@ TradeInprogress = true;
player removeAction s_player_packtent; player removeAction s_player_packtent;
s_player_packtent = 1; s_player_packtent = 1;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_obj = _this; _obj = _this;
_ownerID = _obj getVariable["CharacterID","0"]; _ownerID = _obj getVariable["CharacterID","0"];

2
SQF/dayz_code/compile/player_packVault.sqf
View File

@@ -6,7 +6,7 @@ private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alread
if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_15") , "PLAIN DOWN"]; }; if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_15") , "PLAIN DOWN"]; };
TradeInprogress = true; TradeInprogress = true;
_activatingPlayer = player; _activatingPlayer = getPlayerUID player;
_obj = _this; _obj = _this;

5
SQF/dayz_server/compile/server_swapObject.sqf
View File

@@ -1,10 +1,11 @@
private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed","_obj","_objectID","_objectUID"]; private ["_activatingplayerUID","_class","_uid","_charID","_object","_worldspace","_key","_allowed","_obj","_objectID","_objectUID"];
//[dayz_characterID,_tent,[_dir,_location],"TentStorage"] //[dayz_characterID,_tent,[_dir,_location],"TentStorage"]
_charID = _this select 0; _charID = _this select 0;
_object = _this select 1; _object = _this select 1;
_worldspace = _this select 2; _worldspace = _this select 2;
_class = _this select 3; _class = _this select 3;
_obj = _this select 4; _obj = _this select 4;
_activatingplayerUID = _this select 5;
_obj removeAllMPEventHandlers "MPKilled"; _obj removeAllMPEventHandlers "MPKilled";
@@ -16,7 +17,7 @@ _objectUID = _this select 6;
if(_objectID == "0" && _objectUID == "0") exitWith {diag_log ("Object not valid: "+ str(_object));}; if(_objectID == "0" && _objectUID == "0") exitWith {diag_log ("Object not valid: "+ str(_object));};
[_objectID,_objectUID] call server_deleteObj; [_objectID,_objectUID,_activatingplayerUID] call server_deleteObj;
_allowed = [_object, "Server"] call check_publishobject; _allowed = [_object, "Server"] call check_publishobject;
if (!_allowed) exitWith { deleteVehicle _object; }; if (!_allowed) exitWith { deleteVehicle _object; };