From 657c790ee323b38edb938842acf68fea75ad1d83 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 30 Oct 2016 18:54:54 +0100 Subject: [PATCH] Allow checking dogtags inside vehicles and when sitting (#4619) * Allow checking dogtag inside and when sitting * Remove redundant format --- addons/dogtags/CfgVehicles.hpp | 1 + addons/dogtags/functions/fnc_addDogtagActions.sqf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/dogtags/CfgVehicles.hpp b/addons/dogtags/CfgVehicles.hpp index f2e0fc6ad7..f583164b1f 100644 --- a/addons/dogtags/CfgVehicles.hpp +++ b/addons/dogtags/CfgVehicles.hpp @@ -34,6 +34,7 @@ class CfgVehicles { displayName = CSTRING(checkItem); condition = "true"; statement = ""; + exceptions[] = {"isNotInside", "isNotSitting"}; insertChildren = QUOTE(_this call DFUNC(addDogtagActions)); }; }; diff --git a/addons/dogtags/functions/fnc_addDogtagActions.sqf b/addons/dogtags/functions/fnc_addDogtagActions.sqf index 7cd7529bcc..988f909775 100644 --- a/addons/dogtags/functions/fnc_addDogtagActions.sqf +++ b/addons/dogtags/functions/fnc_addDogtagActions.sqf @@ -32,7 +32,7 @@ private _unitDogtagIDs = []; //Create action children for all dogtags private _actions = []; { - private _displayName = format ["%1", getText (configFile >> "CfgWeapons" >> _x >> "displayName")]; + private _displayName = getText (configFile >> "CfgWeapons" >> _x >> "displayName"); private _picture = getText (configFile >> "CfgWeapons" >> _x >> "picture"); private _action = [_x, _displayName, _picture, {_this call FUNC(checkDogtagItem)}, {true}, {}, _x] call EFUNC(interact_menu,createAction);