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

Remove some unnecessary translations

Browse Source 
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
This commit is contained in:
ebayShopper
2017-04-15 14:19:26 -04:00
parent f20982fe85
commit 78fbd7ac53
13 changed files with 19 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/boil.sqf
View File

@@ -1,6 +1,6 @@
private ["_bottletext","_tin1text","_tin2text","_tintext","_hastinitem","_qty","_dis","_sfx","_WB2Add"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_22" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "displayName");

2
SQF/dayz_code/actions/cook.sqf
View File

@@ -1,5 +1,5 @@
private ["_rawmeat","_cookedmeat","_meat","_meatcooked","_text","_qty","_dis","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_23" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log ("Cook Enabled");
player removeAction s_player_cook;

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

@@ -2,11 +2,7 @@ private ["_item","_type","_hasHarvested","_knifeArray","_PlayerNear","_isListed"
_isZombie = _this isKindOf "zZombie_base";
if (dayz_actionInProgress) exitWith {
if (_isZombie) then {
localize "str_epoch_player_31" call dayz_rollingMessages;
} else {
localize "str_epoch_player_29" call dayz_rollingMessages;
};
localize "str_player_actionslimit" call dayz_rollingMessages;
};
dayz_actionInProgress = true;

2
SQF/dayz_code/actions/player_addToolbelt.sqf
View File

@@ -5,7 +5,7 @@
3. Removing tool from toolbelt and converting it to primary
*/
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_39" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_item","_config","_onLadder","_text","_create","_config2","_primaryFull","_removed","_toolsFull"];

2
SQF/dayz_code/actions/player_craftItem.sqf
View File

@@ -25,7 +25,7 @@ class ItemActions
*/
private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_boiled","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
// This is used to find correct recipe based what itemaction was click allows multiple recipes per item.

2
SQF/dayz_code/actions/player_craftItemVanilla.sqf
View File

@@ -12,7 +12,7 @@
//diag_log("crafting system");
private ["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace","_classname","_isClass","_onLadder","_hasTools","_avail","_selection","_item","_amount","_itemName","_freeSlots","_slotType","_i","_j","_dis","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log(str(isnil "r_player_crafting"));

2
SQF/dayz_code/actions/player_wearClothes.sqf
View File

@@ -6,7 +6,7 @@ _playerNear = {isPlayer _x} count (([player] call FNC_GetPos) nearEntities ["CAM
if (_playerNear) exitWith {localize "STR_EPOCH_PLAYER_84" call dayz_rollingMessages;};
if (_this in DZE_RestrictSkins) exitWith { format[localize "str_epoch_player_315",_this] call dayz_rollingMessages; };
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_83" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
_item call player_wearClothes;

2
SQF/dayz_code/actions/remove.sqf
View File

@@ -1,4 +1,4 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_88" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
delete object from db with extra waiting by [VB]AWOL

2
SQF/dayz_code/actions/repair.sqf
View File

@@ -1,4 +1,4 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_92" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_array","_vehicle","_part","_hitpoint","_type","_hasToolbox","_section","_nameType","_namePart","_damage","_selection","_dis","_sfx","_hitpoints","_allFixed","__FILE__"];