diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp index d2f2f0ef92c..4d445ad9cd4 100644 --- a/addons/interaction/RscTitles.hpp +++ b/addons/interaction/RscTitles.hpp @@ -43,92 +43,6 @@ class RscText; class RscPicture; class RscControlsGroupNoScrollbars; -#define X_OFFSET 0.2 - -class RscACE_SelectAnItem { - idd = 8854; - movingEnable = 0; - - class controls { - class back: IGUIBack { - x = X_OFFSET; - y = 0; - w = 0.6; - h = 0.71; - colorBackground[] = {0, 0, 0, 0.2}; - }; - class header: RscText { - idc = 8870; - x = QUOTE(X_OFFSET + 0.005); - y = 0.005; - w = 0.59; - h = 0.05; - style = 0x02; - text = ""; - }; - class itemList: RscListBox { - onMouseButtonDblClick = QUOTE(_this call DFUNC(onSelectMenuDblClick)); - idc = 8866; - x = QUOTE(X_OFFSET + 0.005); - w = 0.59; - h = 0.54; - y = 0.06; - }; - - class cancelBtnBackground: ACE_Interaction_Button_Base { - type = 0; - style = 2; - idc = -1; - colorBackground[] = {0,0,0,0.5}; - colorBackgroundDisabled[] = {0,0,0,0.5}; - x = QUOTE(X_OFFSET + 0.005); - w = 0.15; - h = 0.1; - y = 0.605; - }; - class approveBtnBackground: ACE_Interaction_Button_Base { - type = 0; - style = 2; - idc = -1; - colorBackground[] = {0,0,0,0.5}; - colorBackgroundDisabled[] = {0,0,0,0.5}; - x = QUOTE(X_OFFSET + 0.445); - y = 0.605; - h = 0.1; - w = 0.15; - }; - - class cancelBtn: ACE_Interaction_Button_Base { - idc = 8855; - x = QUOTE(X_OFFSET + 0.005); - w = 0.15; - h = 0.1; - y = 0.605; - style = 2; - text = CSTRING(Back); - action = QUOTE(call DFUNC(hideMenu)); //'Default' call DFUNC(openMenu); 'Default' call DFUNC(openMenuSelf); - colorBackground[] = {0,0,0,0}; - colorBackgroundDisabled[] = {0,0,0,0}; - colorBackgroundActive[] = {1,1,1,0.2}; - colorFocused[] = {0,0,0,0}; - }; - class approveBtn: ACE_Interaction_Button_Base { - idc = 8860; - x = QUOTE(X_OFFSET + 0.445); - y = 0.605; - h = 0.1; - w = 0.15; - style = 2; - text = CSTRING(MakeSelection); - action = QUOTE(call DFUNC(hideMenu)); - colorBackground[] = {0,0,0,0}; - colorBackgroundDisabled[] = {0,0,0,0}; - colorBackgroundActive[] = {1,1,1,0.2}; - colorFocused[] = {0,0,0,0}; - }; - }; -}; - class RscTitles { class GVAR(RscMouseHint) { idd = IDD_MOUSEHINT; diff --git a/addons/zeus/functions/fnc_bi_moduleProjectile.sqf b/addons/zeus/functions/fnc_bi_moduleProjectile.sqf index a0a81825134..87c9dbdf431 100644 --- a/addons/zeus/functions/fnc_bi_moduleProjectile.sqf +++ b/addons/zeus/functions/fnc_bi_moduleProjectile.sqf @@ -124,11 +124,6 @@ if (_activated) then { _projectile setVelocity _velocity; if (_attach) then {_projectile attachTo [_logic,[0,0,_altitude]];}; - // Added by ace_zeus for ace_frag compatibility - if (!isNil QEFUNC(frag,addPfhRound)) then { - [objNull, _ammo, _projectile, true] call EFUNC(frag,addPfhRound); - }; - //--- Play sound if (_sound != "") then {[[_logic,_sound,"say3D"],"bis_fnc_sayMessage"] call bis_fnc_mp;};