W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-24 17:39:18 +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

6
SQF/dayz_code/actions/trade_metals.sqf
View File

@@ -1,7 +1,7 @@
private ["_buy","_metals_conversion","_cancel"];
if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;};
DZE_ActionInProgress = true;
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;};
dayz_actionInProgress = true;
{player removeAction _x} count s_player_parts;s_player_parts = [];
s_player_parts_crtl = 1;
@@ -23,4 +23,4 @@ _metals_conversion = [
_cancel = player addAction ["Cancel", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false];
s_player_parts set [count s_player_parts,_cancel];
DZE_ActionInProgress = false;
dayz_actionInProgress = false;