Consolidate DZE_ActionInProgress and r_action_count to one variable

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

View File

@@ -13,11 +13,12 @@ _classname = getText (_config >> "tentmodel");
//diag_log ("Classname: "+str(_classname));
//diag_log ("Item: "+str(_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;
// item is missing or tools are missing
if ((!(_item IN magazines player))) exitWith {
r_action_count = 0;
dayz_actionInProgress = false;
format[localize "str_player_31",_text,localize "str_player_31_pitch"] call dayz_rollingMessages;
};
@@ -95,10 +96,9 @@ _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, test
localize "str_success_tent_pitch" call dayz_rollingMessages;
sleep 1;
r_action_count = 0;
} else {
r_action_count = 0;
localize "str_fail_tent_pitch" call dayz_rollingMessages;
};
*/
dayz_actionInProgress = false;
*/