W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #1318

Browse Source 
Issue caused by f0e7622856
This commit is contained in:
icomrade
2014-06-13 16:50:39 -04:00
parent aa416e43fc
commit 0176e5efbb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,8 @@ _abort = false;
_distance = 3; _distance = 3;
_reason = ""; _reason = "";
_waterLevel = 0; _waterLevel = 0;
_outputWeapons = [];
_selectedRecipeOutput = [];
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder); _canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder);
@@ -208,12 +209,10 @@ if (_canDo) then {
} forEach _inputWeapons; } forEach _inputWeapons;
if (_num_removed_weapons == (count _inputWeapons)) then { if (_num_removed_weapons == (count _inputWeapons)) then {
if(_randomOutput == 1) then { if(_randomOutput == 1) then {
_outputWeapons = [];
if (!isNil "_outputWeapons" && count _outputWeapons > 0) then { if (!isNil "_outputWeapons" && count _outputWeapons > 0) then {
_selectedWeapon = _outputWeapons call BIS_fnc_selectRandom; _selectedWeapon = _outputWeapons call BIS_fnc_selectRandom;
_outputWeapons = [_selectedWeapon]; _outputWeapons = [_selectedWeapon];
}; };
_selectedRecipeOutput = [];
if (!isNil "_selectedRecipeOutput" && count _selectedRecipeOutput > 0) then { if (!isNil "_selectedRecipeOutput" && count _selectedRecipeOutput > 0) then {
_selectedMag = _selectedRecipeOutput call BIS_fnc_selectRandom; _selectedMag = _selectedRecipeOutput call BIS_fnc_selectRandom;
_selectedRecipeOutput = [_selectedMag]; _selectedRecipeOutput = [_selectedMag];

7
SQF/dayz_code/compile/BIS_fnc/fn_selectRandom.sqf
View File

@@ -15,9 +15,10 @@ private "_ret";
if(count _this > 0) then if(count _this > 0) then
{ {
_ret = count _this; //number of elements in the array //_ret = count _this; //number of elements in the array
//_ret = [0, _ret] call BIS_fnc_randomInt; //choose random index //_ret = [0, _ret] call BIS_fnc_randomInt; //choose random index
_ret = floor(random _ret); _ret = floor(random(count _this));
_ret = _this select _ret; //get the element, return it _ret = _this select _ret; //get the element, return it
}; };
_ret
_ret;