Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Common - Update CBA_fnc_selectWeapon #1677

Merged
merged 4 commits into from
Aug 8, 2024
Merged

Common - Update CBA_fnc_selectWeapon #1677

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c45072
Update selectWeapon
johnb432 Jul 25, 2024
8a26916
Handle "" and non-existing weapons
johnb432 Jul 28, 2024
9c2f5d2
Update addons/common/fnc_selectWeapon.sqf
johnb432 Jul 28, 2024
9f2b6b6
Update fnc_selectWeapon.sqf
johnb432 Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions addons/common/fnc_selectWeapon.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,38 @@ Examples:
(end)

Author:
Sickboy, commy2
Sickboy, commy2, johnb43
---------------------------------------------------------------------------- */
SCRIPT(selectWeapon);

#define MAXIMUM_TRIES 100

// Mode is not guaranteed to be config-case, so no case-sensitive comparisons possible
params [["_unit", objNull, [objNull]], ["_weapon", "", [""]], ["_mode", "", [""]]];

if (!local _unit) exitWith {false};

private _vehicle = [vehicle _unit, _unit] select (_unit call CBA_fnc_canUseWeapon);

private _index = 0;
// If on foot or in FFV
if (_unit isEqualTo _vehicle) then {
private _weaponState = (_unit weaponState _weapon) select [0, 3];

if (_mode isEqualTo "") then {
while {_index < MAXIMUM_TRIES && {currentMuzzle _unit != _weapon}} do {
_unit action ["SwitchWeapon", _vehicle, _unit, _index];
_index = _index + 1;
if (_mode != "") then {
_weaponState set [2, _mode];
};

_unit selectWeapon _weaponState // return
} else {
while {_index < MAXIMUM_TRIES && {currentMuzzle _unit != _weapon || {currentWeaponMode _unit != _mode}}} do {
_unit action ["SwitchWeapon", _vehicle, _unit, _index];
_index = _index + 1;
private _turretPath = _vehicle unitTurret _unit;
(weaponState [_vehicle, _turretPath, _weapon]) params ["_weapon", "_muzzle", "_currentMode"];

if (_mode == "") then {
_mode = _currentMode;
};
};

_index < MAXIMUM_TRIES // return
_vehicle selectWeaponTurret [_weapon, _turretPath, _muzzle, _mode];

// Get updated state
(weaponState [_vehicle, _turretPath, _weapon]) params ["_newWeapon", "_newMuzzle", "_newMode"];

_newWeapon == _weapon && {_newMuzzle == _muzzle} && {_newMode == _mode} // return
};