From c1a7c977e0d76b2caaaeec28a4241ad15284f5bd Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Jul 2016 14:38:03 -0500 Subject: [PATCH] remove references to unneeded player var --- .../epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf | 6 +++--- .../compile/functions/EPOCH_fnc_playerDeathDetonate.sqf | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index babc4494..5106310f 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -27,10 +27,10 @@ params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]]]; _config = 'CfgEpochClient' call EPOCH_returnConfig; _playerDeathScreen = getText(_config >> "playerDeathScreen"); -_playerRevengeAliveTime = getNumber(_config >> "playerRevengeAliveTime"); +_playerRevengeMinAliveTime = getNumber(_config >> "playerRevengeMinAliveTime"); if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"}; _tapDiag = _playerDeathScreen; -_doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeAliveTime); +_doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && EPOCH_playerAliveTime >= _playerRevengeMinAliveTime); // test ejecting unit from vehicle if dead client side if (vehicle _unit != _unit) then { @@ -65,7 +65,7 @@ if (Epoch_canBeRevived) then { if (playerRespawnTime <= 1) exitWith{ (findDisplay 46) closeDisplay 0; }; if (playerRespawnTime > 15 && !dialog) then {createDialog _tapDiag2;}; if (isObjectHidden player) then {closeDialog 2;}; - if(player getVariable["EPOCH_doBoom",false])exitWith{player setVariable ["EPOCH_doBoom",nil];[player] call EPOCH_fnc_playerDeathDetonate;}; + if(player getVariable["EPOCH_doBoom",false])exitWith{player setVariable ["EPOCH_doBoom",nil]; call EPOCH_fnc_playerDeathDetonate;}; if(player getVariable["EPOCH_doMorph",false])exitWith{player setVariable ["EPOCH_doMorph",nil];[selectRandom (getArray (getMissionConfig "CfgEpochClient" >> "deathMorphClass")),player,_killer2] call EPOCH_fnc_playerDeathMorph;}; uiSleep 0.1; }; diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf index ab8c32e6..9bebad65 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf @@ -20,18 +20,15 @@ Returns: BOOM */ -params ["_player"]; openmap [false,false]; closeDialog 2; - [] spawn{ - // todo: add paricle effect here. // random delay of up to 30 seconds, uisleep (random 25) + 5; - [_player, Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayerDetonate",2]; + [player, Epoch_personalToken] remoteExec ["EPOCH_server_deadPlayerDetonate",2]; deleteVehicle player; player setVariable ["doneBoom", true];