W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-21 19:06: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

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

@@ -3,11 +3,11 @@ disableSerialization;
call gear_ui_init;
closeDialog 0;
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;
_create = _this;
if (!(_create in magazines player)) exitWith {r_action_count = 0;};
if (!(_create in magazines player)) exitWith {dayz_actionInProgress = false;};
_config = configFile >> "CfgMagazines" >> _create;
@@ -20,7 +20,7 @@ _magCount = {_x == _create} count magazines player;
if (_magCount == 1) exitWith {
[format[localize "str_cannotCombine", _name],1] call dayz_rollingMessages;
r_action_count = 0;
dayz_actionInProgress = false;
};
//primary/secondary mags?
@@ -82,4 +82,4 @@ switch true do {
};
uiSleep 1;
r_action_count = 0;
dayz_actionInProgress = false;