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

fix updating flashlight fx after attachment switch #1154

Merged
merged 3 commits into from
Jun 7, 2019
Merged

fix updating flashlight fx after attachment switch #1154

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7c79b4
Add next attachment in next frame
tbeswick96 Jun 2, 2019
54bf3ad
Accessory switch localEvent next frame
tbeswick96 Jun 4, 2019
c9c40ea
Suggestions from commy for readability
tbeswick96 Jun 4, 2019
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
8 changes: 4 additions & 4 deletions addons/accessory/fnc_switchAttachment.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ if (!isNil "_switchItem") then {
switch (_currWeaponType) do {
case 0: {
_unit removePrimaryWeaponItem _currItem;
_unit addPrimaryWeaponItem _switchItem;
[{_this#0 addPrimaryWeaponItem _this#1}, [_unit, _switchItem]] call CBA_fnc_execNextFrame;
commy2 marked this conversation as resolved.
Show resolved Hide resolved
};
case 1: {
_unit removeHandgunItem _currItem;
_unit addHandgunItem _switchItem;
[{_this#0 addHandgunItem _this#1}, [_unit, _switchItem]] call CBA_fnc_execNextFrame;
commy2 marked this conversation as resolved.
Show resolved Hide resolved
};
case 2: {
_unit removeSecondaryWeaponItem _currItem;
_unit addSecondaryWeaponItem _switchItem;
[{_this#0 addSecondaryWeaponItem _this#1}, [_unit, _switchItem]] call CBA_fnc_execNextFrame;
commy2 marked this conversation as resolved.
Show resolved Hide resolved
};
};
private _switchItemHintText = getText (__cfgWeapons >> _switchItem >> "MRT_SwitchItemHintText");
if !(_switchItemHintText isEqualTo "") then {
hintSilent format ["%1", _switchItemHintText];
};
playSound "click";
["CBA_attachmentSwitched", [_unit, _currItem, _switchItem, _currWeaponType]] call CBA_fnc_localEvent;
[{["CBA_attachmentSwitched", _this] call CBA_fnc_localEvent}, [_unit, _currItem, _switchItem, _currWeaponType]] call CBA_fnc_execNextFrame;
commy2 marked this conversation as resolved.
Show resolved Hide resolved
} else {
playSound "ClickSoft";
};
Expand Down