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.

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

Goggles/Fire - Fix adding a RscPicture to RscTitles #10386

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion addons/fire/RscTitles.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class RscPicture;

class RscTitles {
class RscPicture;
class GVAR(onFire1) {
idd = -1;
movingEnable = "true";
Expand Down
16 changes: 14 additions & 2 deletions addons/goggles/RscTitles.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class RscTitles {
#include "define.hpp"
class RscPicture;

class RscTitles {
class RscACE_Goggles_BaseTitle {
idd = -1;
onLoad = "uiNamespace setVariable ['ACE_Goggles_Display', _this select 0]";
Expand All @@ -19,6 +19,10 @@ class RscTitles {
class controls {
class gogglesImage: RscPicture {
idc = 10650;
x = "safeZoneX";
y = "safeZoneY";
w = "safeZoneW";
h = "safeZoneH";
};
};
};
Expand All @@ -33,9 +37,17 @@ class RscTitles {
class controls {
class dirtImage: RscPicture {
idc = 10660;
x = "safeZoneX";
y = "safeZoneY";
w = "safeZoneW";
h = "safeZoneH";
};
class dustImage: RscPicture {
idc = 10662;
x = "safeZoneX";
y = "safeZoneY";
w = "safeZoneW";
h = "safeZoneH";
};
};
};
Expand Down
25 changes: 0 additions & 25 deletions addons/goggles/define.hpp

This file was deleted.

Loading