Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tagging - Fix tagModel not being utilized for custom tags (#9366)

Browse Source 
fix tagModel
This commit is contained in:
Grim
2023-09-06 12:20:04 -04:00
committed by GitHub
parent 576e6b7d55
commit f75d237d47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/tagging/functions/fnc_compileTagAction.sqf
View File

@ -15,7 +15,7 @@
* Public: No * Public: No
*/ */
params ["_class", "_displayName", "_requiredItem", "_textures", "_icon", "_materials"]; params ["_class", "_displayName", "_requiredItem", "_textures", "_icon", "_materials", "_tagModel"];
private _actions = GVAR(itemActions) getOrDefault [_requiredItem, []]; private _actions = GVAR(itemActions) getOrDefault [_requiredItem, []];
@ -24,7 +24,7 @@ _actions pushBack ([
_displayName, _displayName,
_icon, _icon,
{ {
(_this select 2) params ["_class", "_textures", "_materials"]; (_this select 2) params ["_class", "_textures", "_materials", "_tagModel"];
( (
if (count _textures == count _materials) then { if (count _textures == count _materials) then {
@ -35,12 +35,12 @@ _actions pushBack ([
} }
) params ["_randomTexture", "_randomMaterial"]; ) params ["_randomTexture", "_randomMaterial"];
[_player, _randomTexture, _randomMaterial] call FUNC(tag); [_player, _randomTexture, _randomMaterial, _tagModel] call FUNC(tag);
_player setVariable [QGVAR(lastUsedTag), _class]; _player setVariable [QGVAR(lastUsedTag), _class];
}, },
{true}, // required item is checked at an upper level {true}, // required item is checked at an upper level
{}, {},
[_class, _textures, _materials] [_class, _textures, _materials, _tagModel]
] call EFUNC(interact_menu,createAction)); ] call EFUNC(interact_menu,createAction));
GVAR(itemActions) set [_requiredItem, _actions]; GVAR(itemActions) set [_requiredItem, _actions];