Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove references to unneeded player var

Browse Source
This commit is contained in:
vbawol 2016-07-12 14:38:03 -05:00
parent ee7f7497c0
commit c1a7c977e0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf
View File

@ -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;
};

5
Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeathDetonate.sqf
View File

@ -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];