W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-20 18:36:29 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate DZE_ActionInProgress and r_action_count to one variable

Browse Source 
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
This commit is contained in:
ebaydayz
2016-08-25 15:38:27 -04:00
parent 6b101d3c2e
commit c2b16f0828
90 changed files with 364 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQF/dayz_code/actions/player_setTrap.sqf
View File

@@ -3,10 +3,11 @@ private ["_item","_config","_onLadder","_classname","_text","_consume","_hastrap
_item = _this;
_config = configFile >> "CfgWeapons" >> _item;
if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
dayz_actionInProgress = true;
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
if (_onLadder) exitWith { r_action_count = 0; localize "str_player_21" call dayz_rollingMessages;};
if (_onLadder) exitWith { dayz_actionInProgress = false; localize "str_player_21" call dayz_rollingMessages;};
call gear_ui_init;
@@ -16,7 +17,7 @@ _consume = ([] + getArray (_config >> "magazines")) select 0;
_hastrapitem = _item in magazines player;
if (!_hastrapitem) exitWith { r_action_count = 0; format[localize "str_player_31",_text,localize "str_player_31_place"] call dayz_rollingMessages;};
if (!_hastrapitem) exitWith { dayz_actionInProgress = false; format[localize "str_player_31",_text,localize "str_player_31_place"] call dayz_rollingMessages;};
player removeMagazine _item;
_location = getPosATL player;
@@ -35,5 +36,5 @@ diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hiv
player reveal _object;
r_action_count = 0;
dayz_actionInProgress = false;
format[localize "str_build_01",_text] call dayz_rollingMessages;