diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index 72bea512d6..501cc9eb91 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -1,6 +1,8 @@ //XEH_clientInit.sqf #include "script_component.hpp" +if (!hasInterface) exitWith {}; + // Install the render EH on the main display addMissionEventHandler ["Draw3D", DFUNC(render)]; @@ -10,17 +12,17 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; // Wait until the map display is detected waitUntil {(!isNull findDisplay 12)}; - // Install the render EH on the map screen + // Install the render EH on the map screen ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", DFUNC(render)]; }; -["ACE3", QGVAR(InteractKey), "Interact Key", +["ACE3", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"), {[0] call FUNC(keyDown)}, {[0] call FUNC(keyUp)}, [219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key -["ACE3", QGVAR(SelfInteractKey), "Self Actions Key", +["ACE3", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"), {[1] call FUNC(keyDown)}, {[1] call FUNC(keyUp)}, [219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf index ccdce4dd5c..968b143701 100644 --- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf +++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf @@ -83,11 +83,19 @@ private ["_baseDisplayName", "_baseIcon"]; _baseDisplayName = ""; _baseIcon = ""; if (_objectType isKindOf "CAManBase") then { - _baseDisplayName = "Self Actions"; + _baseDisplayName = localize "STR_ACE_Interact_Menu_SelfActionsRoot"; _baseIcon = "\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa"; } else { _baseDisplayName = getText (configFile >> "CfgVehicles" >> _objectType >> "displayName"); + //Alt would be to just use a static text, if veh names end up being too long: + // _baseDisplayName = localize "STR_ACE_Interact_Menu_VehicleActionsRoot"; + + //Pull the icon from the vehicle's config: _baseIcon = getText (configFile >> "CfgVehicles" >> _objectType >> "Icon"); + //icon could be a CfgVehicleIcons + if isText (configFile >> "CfgVehicleIcons" >> _baseIcon) then { + _baseIcon = getText (configFile >> "CfgVehicleIcons" >> _baseIcon); + }; }; // Create a master action to base on self action diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index cecb24fee2..6e5ce8fdb2 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,7 +1,21 @@  + Always display cursor for self interaction - + + Interact Key + + + Self Interaction Key + + + Self Actions + + + Vehicle Actions + + + \ No newline at end of file