Auto select main weapon after throwing

Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

08449fdfda
This commit is contained in:
ebaydayz
2016-09-06 16:36:45 -04:00
parent bbf0ac583d
commit 771284a297
4 changed files with 27 additions and 1 deletions

View File

@@ -98,5 +98,8 @@ if ((_ammo isKindOf "SmokeShell") or (_ammo isKindOf "GrenadeHandTimedWest") or
publicVariable "PVDZ_obj_RoadFlare";
[_this] spawn player_throwObject;
};
//Auto select main weapon after throwing
call player_selectWeapon;
};
};

View File

@@ -0,0 +1,22 @@
/*
Call this function to select primary or pistol (if no primary)
when the player's currently selected weapon is a throwable.
*/
private ["_main","_muzzle"];
if (currentWeapon player == "Throw") then {
_main = primaryWeapon player;
if (_main == "") then {
{
if (getNumber (configFile >> "CfgWeapons" >> _x >> "type") == 2) then {_main = _x;};
} count (weapons player);
};
_muzzle = getArray (configFile >> "CfgWeapons" >> _main >> "muzzles");
if (count _muzzle > 1) then {
player selectWeapon (_muzzle select 0);
} else {
player selectWeapon _main;
};
};