W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-22 03:16:27 +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

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

@@ -1,8 +1,8 @@
private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"];
// [part_out,part_in, qty_out, qty_in,"buy"];
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;
_activatingPlayer = player;
@@ -70,7 +70,7 @@ if(_buy_o_sell == "sell") then {
if (_abort) exitWith {
_msg call dayz_rollingMessages;
DZE_ActionInProgress = false;
dayz_actionInProgress = false;
};
localize "str_epoch_player_105" call dayz_rollingMessages;
@@ -108,7 +108,7 @@ if (!_finished) exitWith {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
DZE_ActionInProgress = false;
dayz_actionInProgress = false;
localize "str_epoch_player_106" call dayz_rollingMessages;
};
@@ -184,4 +184,4 @@ if (_finished) then {
};
};
DZE_ActionInProgress = false;
dayz_actionInProgress = false;