Skip to content

Commit

Permalink
Cleanup spaces in config macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@PabstMirror
PabstMirror committed Nov 4, 2023
1 parent a52f403 commit 830251a
Show file tree
Hide file tree
Showing 16 changed files with 429 additions and 429 deletions.
2 changes: 1 addition & 1 deletion addons/ace_interact/ace_arsenal_stats.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class statBase;
class GVAR(frequencyRange): statBase {
scope = 2;
stats[] = {QEGVAR(arsenalStats,frequencyMin), QEGVAR(arsenalStats,frequencyMax)};
stats[] = {QEGVAR(arsenalStats,frequencyMin),QEGVAR(arsenalStats,frequencyMax)};
displayName= CSTRING(arsenalStats_frequencyRange);
showText = 1;
textStatement = QUOTE(call FUNC(arsenalStats_frequencyRange));
Expand Down
12 changes: 6 additions & 6 deletions addons/sys_bf888s/bf888s_RadioDialog.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#define CODE_SPACING 0.0245

#define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;

#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
#define END_CONTROL };

#define NEW_SCALE 0.85
Expand Down Expand Up @@ -38,7 +38,7 @@ class BF888S_RadioDialog {
text = QPATHTOF(Data\static\bf888s_ui_backplate.paa);
};
class controls {
BEGIN_CONTROL(ChannelKnob, BF888S_RscPicture, 106)
BEGIN_CONTROL(ChannelKnob,BF888S_RscPicture,106)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
w = QUOTE(NEW_SCALE*safeZoneH);
Expand All @@ -47,7 +47,7 @@ class BF888S_RadioDialog {
END_CONTROL

// x 1048, y 927
BEGIN_CONTROL(ChannelKnobButton, BF888S_RscButton, 201)
BEGIN_CONTROL(ChannelKnobButton,BF888S_RscButton,201)
x = QUOTE((((((0.410+0.085)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
y = QUOTE(((((0.38-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE(SCALE*0.04*SafeZoneH);
Expand All @@ -58,7 +58,7 @@ class BF888S_RadioDialog {
toolTip = ECSTRING(sys_radio,ui_ChangeChannel);
END_CONTROL

BEGIN_CONTROL(VolumeKnob, BF888S_RscPicture, 107)
BEGIN_CONTROL(VolumeKnob,BF888S_RscPicture,107)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
w = QUOTE(NEW_SCALE*safeZoneH);
Expand All @@ -67,7 +67,7 @@ class BF888S_RadioDialog {
END_CONTROL

// x 1186, y 922
BEGIN_CONTROL(VolumeKnobButton, BF888S_RscButton, 202)
BEGIN_CONTROL(VolumeKnobButton,BF888S_RscButton,202)
x = QUOTE((((((0.450+0.085)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
y = QUOTE(((((0.38-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE(SCALE*0.04*SafeZoneH);
Expand Down
22 changes: 11 additions & 11 deletions addons/sys_intercom/vic3/vic3_ffcs_intercomDialog.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#define CODE_SPACING 0.0245

#define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;

#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
#define END_CONTROL };

#define NEW_SCALE 1.4
Expand All @@ -18,39 +18,39 @@ class VIC3FFCS_IntercomDialog {
objects[] = {};

class controls {
BEGIN_CONTROL(Vic3ffcsBackground, VIC3FFCS_RscPicture, 100)
BEGIN_CONTROL(Vic3ffcsBackground,VIC3FFCS_RscPicture,100)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
w = QUOTE(NEW_SCALE * SafeZoneH);
h = QUOTE(NEW_SCALE * SafeZoneH);
text = QPATHTOF(vic3\data\ui\vic3_ffcs.paa);
END_CONTROL

BEGIN_CONTROL(IntercomKnob, VIC3FFCS_RscPicture, 101)
BEGIN_CONTROL(IntercomKnob,VIC3FFCS_RscPicture,101)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
w = QUOTE(NEW_SCALE * SafeZoneH);
h = QUOTE(NEW_SCALE * SafeZoneH);
text = QPATHTOF(vic3\data\knobs\intercom\intercom_0.paa);
END_CONTROL

BEGIN_CONTROL(MonitorKnob, VIC3FFCS_RscPicture, 102)
BEGIN_CONTROL(MonitorKnob,VIC3FFCS_RscPicture,102)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
w = QUOTE(NEW_SCALE * SafeZoneH);
h = QUOTE(NEW_SCALE * SafeZoneH);
text = QPATHTOF(vic3\data\knobs\monitor\monitor_0.paa);
END_CONTROL

BEGIN_CONTROL(VolumeKnob, VIC3FFCS_RscPicture, 103)
BEGIN_CONTROL(VolumeKnob,VIC3FFCS_RscPicture,103)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
w = QUOTE(NEW_SCALE * SafeZoneH);
h = QUOTE(NEW_SCALE * SafeZoneH);
text = QPATHTOF(vic3\data\knobs\volume\volume_10.paa);
END_CONTROL

BEGIN_CONTROL(WorkKnob, VIC3FFCS_RscPicture, 104)
BEGIN_CONTROL(WorkKnob,VIC3FFCS_RscPicture,104)
x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
w = QUOTE(NEW_SCALE * SafeZoneH);
Expand All @@ -59,7 +59,7 @@ class VIC3FFCS_IntercomDialog {
END_CONTROL

// Do the buttons last so they come on top.
BEGIN_CONTROL(IntercomKnobButton, VIC3FFCS_RscButton, 201)
BEGIN_CONTROL(IntercomKnobButton,VIC3FFCS_RscButton,201)
x = QUOTE(((((0.466-0.45)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
y = QUOTE(((((0.595-0.61)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
Expand All @@ -69,7 +69,7 @@ class VIC3FFCS_IntercomDialog {
toolTip = QUOTE(Change intercom activation);
END_CONTROL

BEGIN_CONTROL(MonitorKnobButton, VIC3FFCS_RscButton, 202)
BEGIN_CONTROL(MonitorKnobButton,VIC3FFCS_RscButton,202)
x = QUOTE(((((0.466-0.45)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
y = QUOTE(((((0.595-0.745)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
Expand All @@ -79,7 +79,7 @@ class VIC3FFCS_IntercomDialog {
toolTip = QUOTE(Change monitored radio);
END_CONTROL

BEGIN_CONTROL(VolumeKnobButton, VIC3FFCS_RscButton, 203)
BEGIN_CONTROL(VolumeKnobButton,VIC3FFCS_RscButton,203)
x = QUOTE(((((0.466-0.597)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
y = QUOTE(((((0.595-0.61)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
Expand All @@ -89,7 +89,7 @@ class VIC3FFCS_IntercomDialog {
toolTip = ECSTRING(sys_radio,ui_ChangeVolume);
END_CONTROL

BEGIN_CONTROL(WorkKnobButton, VIC3FFCS_RscButton, 204)
BEGIN_CONTROL(WorkKnobButton,VIC3FFCS_RscButton,204)
x = QUOTE(((((0.466-0.597)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
y = QUOTE(((((0.595-0.745)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
Expand Down
Loading

0 comments on commit 830251a

Please sign in to comment.