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

Zeus - Cleanup unneeded frag compat #10419

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Zeus - Cleanup unneeded frag compat #10419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13c38c
Zeus - Cleanup unneeded frag compat
PabstMirror Oct 14, 2024
ebeeef8
Interaction - Cleanup unused `RscACE_SelectAnItem`
PabstMirror Oct 14, 2024
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
86 changes: 0 additions & 86 deletions addons/interaction/RscTitles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions addons/zeus/functions/fnc_bi_moduleProjectile.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;};

Expand Down