Skip to content

Commit f3a023a

Browse files
ultranoobianultranoobian
committed
Fixed class definition clash
1 parent 1e8a3b9 commit f3a023a

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎source/taw_vd/GUI.h‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "defines.h"
22

3-
class RscEdit {
3+
class RscEdit_taw {
44
type = 2;
55
style = 0x00 + 0x40;
66
font = "PuristaMedium";
@@ -16,7 +16,7 @@ class RscEdit {
1616
canModify = 1;
1717
};
1818

19-
class RscListBox {
19+
class RscListBox_taw {
2020
style = 16;
2121
idc = -1;
2222
type = 5;
@@ -51,7 +51,7 @@ class RscListBox {
5151
tooltipColorText[] = {1,1,1,1};
5252
tooltipColorBox[] = {1,1,1,1};
5353
tooltipColorShade[] = {0,0,0,0.65};
54-
54+
5555
class ListScrollBar {
5656
color[] = {1,1,1,1};
5757
colorActive[] = {1,1,1,1};
@@ -145,7 +145,7 @@ class RscXSliderH {
145145
thumb = "\A3\ui_f\data\gui\cfg\slider\thumb_ca.paa";
146146
};
147147

148-
class RscText {
148+
class RscText_taw {
149149
x = 0;
150150
y = 0;
151151
h = 0.037;
@@ -162,14 +162,14 @@ class RscText {
162162
linespacing = 1;
163163
};
164164

165-
class RscTitle:RscText {
165+
class RscTitle:RscText_taw {
166166
style = 0;
167167
shadow = 0;
168168
sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
169169
colorText[] = {0.95, 0.95, 0.95, 1};
170170
};
171171

172-
class RscShortcutButton {
172+
class RscShortcutButton_taw {
173173
idc = -1;
174174
style = 0;
175175
default = 0;
@@ -234,7 +234,7 @@ class RscShortcutButton {
234234
font = "PuristaMedium";
235235
color = "#E5E5E5";
236236
align = "left";
237-
};
237+
};
238238
};
239239

240240
class RscControlsGroup {
@@ -258,7 +258,7 @@ class RscControlsGroup {
258258
shadow = 0;
259259
scrollSpeed = 0.05;
260260
};
261-
261+
262262
class VScrollbar:ScrollBar {
263263
width = 0.021;
264264
autoScrollSpeed = -1;
@@ -267,29 +267,29 @@ class RscControlsGroup {
267267
shadow = 0;
268268
color[] = {1, 1, 1, 0.6};
269269
};
270-
270+
271271
class HScrollbar:ScrollBar {
272272
height = 0.028;
273273
shadow = 0;
274274
color[] = {1, 1, 1, 0.6};
275275
};
276-
276+
277277
//class ListScrollBar : ScrollBar {};
278-
278+
279279
class Controls {};
280280
};
281281

282282
class RscControlsGroupNoScrollbars : RscControlsGroup {
283283
class VScrollbar : VScrollbar {
284284
width = 0;
285285
};
286-
286+
287287
class HScrollbar : HScrollbar {
288288
height = 0;
289289
};
290290
};
291291

292-
class RscButtonMenu:RscShortcutButton {
292+
class RscButtonMenu:RscShortcutButton_taw {
293293
idc = -1;
294294
type = 16;
295295
style = "0x02 + 0xC0";
@@ -354,11 +354,11 @@ class TAW_VDMenu {
354354
name = "TAW_VDMenu";
355355
movingEnabled = 0;
356356
enableSimulation = 1;
357-
357+
358358
onLoad = "((_this select 0) displayCtrl 2999) ctrlSetFade 1; ((_this select 0) displayCtrl 2999) ctrlCommit 0;";
359359

360360
class controlsBackground {
361-
class TitleBackground : RscText {
361+
class TitleBackground : RscText_taw {
362362
colorBackground[] = { "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.7])" };
363363
idc = -1;
364364
x = .3;
@@ -367,15 +367,15 @@ class TAW_VDMenu {
367367
h = (1 / 25);
368368
};
369369

370-
class MainBackground : RscText {
370+
class MainBackground : RscText_taw {
371371
colorBackground[] = { 0, 0, 0, .7 };
372372
idc = -1;
373373
x = .3;
374374
y = .2 + (11 / 250);
375375
w = .5;
376376
h = .57 - (22 / 250);
377377
};
378-
378+
379379
class Title : RscTitle {
380380
colorBackround[] = { 0, 0, 0, 0 };
381381
idc = -1;
@@ -386,7 +386,7 @@ class TAW_VDMenu {
386386
h = (1 / 25);
387387
};
388388

389-
class OnFootText : RscText {
389+
class OnFootText : RscText_taw {
390390
idc = -1;
391391
text = "Infantry:";
392392
x = .32;
@@ -409,7 +409,7 @@ class TAW_VDMenu {
409409
text = "Object:";
410410
y = .655;
411411
};
412-
412+
413413
class DroneText : OnFootText {
414414
text = "Drone:";
415415
y = .405;
@@ -435,7 +435,7 @@ class TAW_VDMenu {
435435
w = (6.25 / 40);
436436
h = (1 / 25);
437437
};
438-
438+
439439
class SaveManagerBtn:ButtonClose {
440440
text = "Saves";
441441
onButtonClick = "[] call tawvd_fnc_openSaveManager;";
@@ -477,7 +477,7 @@ class TAW_VDMenu {
477477
onSliderPosChanged = "[3, _this select 1] call TAWVD_fnc_onSliderChanged;";
478478
y = .7 - (1 / 25);
479479
};
480-
480+
481481
class VD_Drone_slider:VD_onFoot_slider {
482482
idc = DRONE_SLIDER;
483483
toolTip = "View distance while operating a UAV/UGV";
@@ -486,7 +486,7 @@ class TAW_VDMenu {
486486
}
487487

488488
//Values (RscEdit Butons)
489-
class VD_onFoot_Edit : RscEdit {
489+
class VD_onFoot_Edit : RscEdit_taw {
490490
idc = INFANTRY_EDIT;
491491
text = "";
492492
onKeyUp = "[_this select 0, _this select 1, 'ground',true] call TAWVD_fnc_onChar;";
@@ -508,7 +508,7 @@ class TAW_VDMenu {
508508
onKeyUp = "[_this select 0, _this select 1, 'air',true] call TAWVD_fnc_onChar;";
509509
y = .36;
510510
};
511-
511+
512512
class VD_inDrone_Edit:VD_onFoot_Edit {
513513
idc = DRONE_EDIT;
514514
onKeyUp = "[_this select 0, _this select 1, 'drone',true] call TAWVD_fnc_onChar;";
@@ -570,40 +570,40 @@ class TAW_VDMenu {
570570
tooltip = "Sync object rendering with view rendering";
571571
onCheckedChanged = "if((_this select 1) == 1) then {tawvd_syncObject = true;ctrlEnable [2941,false]; ctrlEnable [2942,false];} else {tawvd_syncObject = false; ctrlEnable [2942,true]; ctrlEnable [2941,true];};";
572572
w = 1 * GUI_GRID_CENTER_W;
573-
h = 1 * GUI_GRID_CENTER_H;
573+
h = 1 * GUI_GRID_CENTER_H;
574574
};
575575

576-
class ObjectSynctext : RscText {
576+
class ObjectSynctext : RscText_taw {
577577
idc = -1;
578578
text = "Sync with view";
579579
x = .345; y = .596;
580580
w = .35; h = .04;
581581
};
582-
582+
583583
class Manager:RscControlsGroup {
584584
idc = MANAGER_GROUP;
585-
585+
586586
x = -0.21; y = .2;
587587
w = .5; h = 3;
588588
class Controls {
589589
class SaveLoadGroup:RscControlsGroupNoScrollbars {
590590
idc = SAVELOAD_GROUP;
591-
591+
592592
x = 0;
593593
y = 0;
594594
w = .5;
595595
h = 3;
596-
596+
597597
class Controls {
598-
class MyTitleBackground:RscText {
598+
class MyTitleBackground:RscText_taw {
599599
colorBackground[] = { "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", "(profilenamespace getvariable ['GUI_BCG_RGB_A',0.7])" };
600600
idc = -1;
601601
x = 0;
602602
y = 0;
603603
w = .5;
604604
h = (1 / 25);
605605
};
606-
606+
607607
class Title : RscTitle {
608608
colorBackround[] = { 0, 0, 0, 0 };
609609
idc = -1;
@@ -613,36 +613,36 @@ class TAW_VDMenu {
613613
w = .8;
614614
h = (1 / 25);
615615
};
616-
617-
class MainBackground:RscText {
616+
617+
class MainBackground:RscText_taw {
618618
colorBackground[] = { 0, 0, 0, .7 };
619619
idc = -1;
620620
x = 0;
621621
y = 0 + (11 / 250);
622622
w = .5;
623623
h = .57 - (22 / 250);
624624
};
625-
626-
class SaveList:RscListBox {
625+
626+
class SaveList:RscListBox_taw {
627627
idc = SAVES_LIST;
628628
sizeEx = 0.04;
629629
colorBackground[] = {0.1,0.1,0.1,0.9};
630630
x = 0; y = 0 + (11 / 250);
631631
w = .5; h = .49 - (22 / 250);
632-
632+
633633
onLBSelChanged = "_this call TAWVD_fnc_onSaveSelectionChanged;";
634634
};
635-
635+
636636
class SaveSlotName:VD_onFoot_Edit {
637637
idc = SLOT_NAME;
638638
text = "SAVE NAME";
639639
colorBackground[] = {0,0,0,0.6};
640640
onKeyUp = "";
641-
641+
642642
x = .025; y = .42 + (11 / 250);
643643
w = .45;
644644
};
645-
645+
646646
class SaveButton:RscButtonMenu {
647647
text = "Save";
648648
onButtonClick = "[] call TAWVD_fnc_onSavePressed;";
@@ -651,7 +651,7 @@ class TAW_VDMenu {
651651
w = (6.25 / 40);
652652
h = (1 / 25);
653653
};
654-
654+
655655
class HideButton:RscButtonMenu {
656656
text = "Hide";
657657
onButtonClick = "((findDisplay 2900) displayCtrl 2999) ctrlSetFade 1; ((findDisplay 2900) displayCtrl 2999) ctrlCommit 0.3;";
@@ -665,4 +665,4 @@ class TAW_VDMenu {
665665
};
666666
};
667667
};
668-
};
668+
};

0 commit comments

Comments
 (0)