W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-18 09:32:02 +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/player_reloadMags.sqf
View File

@@ -7,12 +7,12 @@ disableSerialization;
call gear_ui_init;
//note - one slot ammo can be used!
r_action_count = r_action_count + 1;
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;
_item = _this;
if (!(_item in magazines player)) exitWith {r_action_count = 0;};
if (!(_item in magazines player)) exitWith {dayz_actionInProgress = false;};
_config = configFile >> "CfgMagazines" >> _item;
@@ -96,7 +96,7 @@ if (_consume_magsize > _create_magsize) then {
};
if ((_qtynew_create_mags + _qtynew_consume_mags) > (_qty_create_mags + _qty_consume_mags + _qty_free_slots)) exitWith {
r_action_count = 0;
dayz_actionInProgress = false;
localize "str_player_24" call dayz_rollingMessages;
};
_qtynew_consume_mags_full = floor(_qtynew_consume_ammo/_consume_magsize);
@@ -121,4 +121,4 @@ if (_qtynew_create_ammo_rest != 0) then {
player addMagazine [_create,_qtynew_create_ammo_rest];
};
uiSleep 1;
r_action_count = 0;
dayz_actionInProgress = false;