Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tools - Fix configs for hemtt1.9.0 (#9423)

Browse Source
This commit is contained in:
PabstMirror 2023-09-23 11:37:41 -05:00 committed by GitHub
parent bd5c4850be
commit d8eb97f4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addons/arsenal/ui/RscAttributes.hpp
View File

@ -654,7 +654,7 @@ class GVAR(display) {
w = QUOTE(6 * GRID_W); w = QUOTE(6 * GRID_W);
h = QUOTE(6 * GRID_H); h = QUOTE(6 * GRID_H);
}; };
class rightSearchbar: leftSearchBar { class rightSearchbar: leftSearchbar {
idc = IDC_rightSearchbar; idc = IDC_rightSearchbar;
onSetFocus = QUOTE(GVAR(rightSearchbarFocus) = true); onSetFocus = QUOTE(GVAR(rightSearchbarFocus) = true);
onKillFocus = QUOTE(GVAR(rightSearchbarFocus) = false); onKillFocus = QUOTE(GVAR(rightSearchbarFocus) = false);
@ -693,7 +693,7 @@ class GVAR(display) {
w = QUOTE(9 * GRID_W); w = QUOTE(9 * GRID_W);
h = QUOTE(9 * GRID_H); h = QUOTE(9 * GRID_H);
}; };
class iconBackgroundHandgun: IconBackgroundPrimaryWeapon { class iconBackgroundHandgun: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundHandgun; idc = IDC_iconBackgroundHandgun;
y = QUOTE(10 * GRID_H); y = QUOTE(10 * GRID_H);
}; };
@ -703,7 +703,7 @@ class GVAR(display) {
tooltip = "$STR_A3_RscDisplayArsenal_tab_Handgun"; tooltip = "$STR_A3_RscDisplayArsenal_tab_Handgun";
y = QUOTE(10 * GRID_H); y = QUOTE(10 * GRID_H);
}; };
class iconBackgroundSecondaryWeapon: IconBackgroundPrimaryWeapon { class iconBackgroundSecondaryWeapon: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundSecondaryWeapon; idc = IDC_iconBackgroundSecondaryWeapon;
y = QUOTE(20 * GRID_H); y = QUOTE(20 * GRID_H);
}; };
@ -713,7 +713,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\SecondaryWeapon_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\SecondaryWeapon_ca.paa";
y = QUOTE(20 * GRID_H); y = QUOTE(20 * GRID_H);
}; };
class iconBackgroundHeadgear: IconBackgroundPrimaryWeapon { class iconBackgroundHeadgear: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundHeadgear; idc = IDC_iconBackgroundHeadgear;
y = QUOTE(30 * GRID_H); y = QUOTE(30 * GRID_H);
}; };
@ -723,7 +723,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Headgear_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Headgear_ca.paa";
y = QUOTE(30 * GRID_H); y = QUOTE(30 * GRID_H);
}; };
class iconBackgroundUniform: IconBackgroundPrimaryWeapon { class iconBackgroundUniform: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundUniform; idc = IDC_iconBackgroundUniform;
y = QUOTE(40 * GRID_H); y = QUOTE(40 * GRID_H);
}; };
@ -733,7 +733,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Uniform_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Uniform_ca.paa";
y = QUOTE(40 * GRID_H); y = QUOTE(40 * GRID_H);
}; };
class iconBackgroundVest: IconBackgroundPrimaryWeapon { class iconBackgroundVest: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundVest; idc = IDC_iconBackgroundVest;
y = QUOTE(50 * GRID_H); y = QUOTE(50 * GRID_H);
}; };
@ -743,7 +743,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Vest_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Vest_ca.paa";
y = QUOTE(50 * GRID_H); y = QUOTE(50 * GRID_H);
}; };
class iconBackgroundBackpack: IconBackgroundPrimaryWeapon { class iconBackgroundBackpack: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundBackpack; idc = IDC_iconBackgroundBackpack;
y = QUOTE(60 * GRID_H); y = QUOTE(60 * GRID_H);
}; };
@ -753,7 +753,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Backpack_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Backpack_ca.paa";
y = QUOTE(60 * GRID_H); y = QUOTE(60 * GRID_H);
}; };
class iconBackgroundGoggles: IconBackgroundPrimaryWeapon { class iconBackgroundGoggles: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundGoggles; idc = IDC_iconBackgroundGoggles;
y = QUOTE(70 * GRID_H); y = QUOTE(70 * GRID_H);
}; };
@ -763,7 +763,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Goggles_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Goggles_ca.paa";
y = QUOTE(70 * GRID_H); y = QUOTE(70 * GRID_H);
}; };
class iconBackgroundNVG: IconBackgroundPrimaryWeapon { class iconBackgroundNVG: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundNVG; idc = IDC_iconBackgroundNVG;
y = QUOTE(80 * GRID_H); y = QUOTE(80 * GRID_H);
}; };
@ -773,7 +773,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\NVGs_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\NVGs_ca.paa";
y = QUOTE(80 * GRID_H); y = QUOTE(80 * GRID_H);
}; };
class iconBackgroundBinoculars: IconBackgroundPrimaryWeapon { class iconBackgroundBinoculars: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundBinoculars; idc = IDC_iconBackgroundBinoculars;
y = QUOTE(90 * GRID_H); y = QUOTE(90 * GRID_H);
}; };
@ -783,7 +783,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Binoculars_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Binoculars_ca.paa";
y = QUOTE(90 * GRID_H); y = QUOTE(90 * GRID_H);
}; };
class iconBackgroundMap: IconBackgroundPrimaryWeapon { class iconBackgroundMap: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundMap; idc = IDC_iconBackgroundMap;
y = QUOTE(100 * GRID_H); y = QUOTE(100 * GRID_H);
}; };
@ -793,7 +793,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Map_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Map_ca.paa";
y = QUOTE(100 * GRID_H); y = QUOTE(100 * GRID_H);
}; };
class iconBackgroundGPS: IconBackgroundPrimaryWeapon { class iconBackgroundGPS: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundGPS; idc = IDC_iconBackgroundGPS;
y = QUOTE(110 * GRID_H); y = QUOTE(110 * GRID_H);
}; };
@ -803,7 +803,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\GPS_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\GPS_ca.paa";
y = QUOTE(110 * GRID_H); y = QUOTE(110 * GRID_H);
}; };
class iconBackgroundRadio: IconBackgroundPrimaryWeapon { class iconBackgroundRadio: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundRadio; idc = IDC_iconBackgroundRadio;
y = QUOTE(120 * GRID_H); y = QUOTE(120 * GRID_H);
}; };
@ -813,7 +813,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Radio_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Radio_ca.paa";
y = QUOTE(120 * GRID_H); y = QUOTE(120 * GRID_H);
}; };
class iconBackgroundCompass: IconBackgroundPrimaryWeapon { class iconBackgroundCompass: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundCompass; idc = IDC_iconBackgroundCompass;
y = QUOTE(130 * GRID_H); y = QUOTE(130 * GRID_H);
}; };
@ -823,7 +823,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Compass_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Compass_ca.paa";
y = QUOTE(130 * GRID_H); y = QUOTE(130 * GRID_H);
}; };
class iconBackgroundWatch: IconBackgroundPrimaryWeapon { class iconBackgroundWatch: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundWatch; idc = IDC_iconBackgroundWatch;
y = QUOTE(140 * GRID_H); y = QUOTE(140 * GRID_H);
}; };
@ -833,7 +833,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Watch_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Watch_ca.paa";
y = QUOTE(140 * GRID_H); y = QUOTE(140 * GRID_H);
}; };
class iconBackgroundFace: IconBackgroundPrimaryWeapon { class iconBackgroundFace: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundFace; idc = IDC_iconBackgroundFace;
y = QUOTE(150 * GRID_H); y = QUOTE(150 * GRID_H);
}; };
@ -843,7 +843,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Face_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Face_ca.paa";
y = QUOTE(150 * GRID_H); y = QUOTE(150 * GRID_H);
}; };
class iconBackgroundVoice: IconBackgroundPrimaryWeapon { class iconBackgroundVoice: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundVoice; idc = IDC_iconBackgroundVoice;
y = QUOTE(160 * GRID_H); y = QUOTE(160 * GRID_H);
}; };
@ -853,7 +853,7 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Voice_ca.paa"; text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Voice_ca.paa";
y = QUOTE(160 * GRID_H); y = QUOTE(160 * GRID_H);
}; };
class iconBackgroundInsigna: IconBackgroundPrimaryWeapon { class iconBackgroundInsigna: iconBackgroundPrimaryWeapon {
idc = IDC_iconBackgroundInsigna; idc = IDC_iconBackgroundInsigna;
y = QUOTE(170 * GRID_H); y = QUOTE(170 * GRID_H);
}; };
@ -1041,7 +1041,7 @@ class GVAR(loadoutsDisplay) {
h = QUOTE(5 * GRID_H); h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(5 * GRID_H); sizeEx = QUOTE(5 * GRID_H);
}; };
class contentPanel: RscListnBox { class contentPanel: RscListNBox {
idc = IDC_contentPanel; idc = IDC_contentPanel;
columns[] = {0, 0.05, 0.40, 0.50, 0.60, 0.70, 0.75, 0.80, 0.85, 0.90}; columns[] = {0, 0.05, 0.40, 0.50, 0.60, 0.70, 0.75, 0.80, 0.85, 0.90};
drawSideArrows = 0; drawSideArrows = 0;

2
addons/artillerytables/RscRangeTable.hpp
View File

@ -46,7 +46,7 @@ class GVAR(rangeTableDialog) {
color[] = {0,0,0,0.6}; color[] = {0,0,0,0.6};
}; };
}; };
class ChargeListBox: RscListbox { class ChargeListBox: RscListBox {
idc = IDC_CHARGELIST; idc = IDC_CHARGELIST;
x = "13 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)"; x = "13 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
y = "2 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)"; y = "2 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";

2
addons/artillerytables/config.cpp
View File

@ -29,7 +29,7 @@ class ACE_Extensions {
// Common UI Stuff: // Common UI Stuff:
class RscText; class RscText;
class RscListbox; class RscListBox;
class RscListNBox; class RscListNBox;
class RscPicture; class RscPicture;
class RscControlsGroup; class RscControlsGroup;

2
addons/chemlights/CfgMagazines.hpp
View File

@ -2,7 +2,7 @@
class CfgMagazines { class CfgMagazines {
class SmokeShell; class SmokeShell;
class Chemlight_Green: Smokeshell { class Chemlight_Green: SmokeShell {
ACE_Chemlight_Shield = "ACE_Chemlight_Shield_Green"; ACE_Chemlight_Shield = "ACE_Chemlight_Shield_Green";
}; };

2
addons/compat_rhs_usf3/CfgVehicles.hpp
View File

@ -1,5 +1,5 @@
class CfgVehicles { class CfgVehicles {
class Heli_Light_03_base_F; class Heli_light_03_base_F;
class RHS_UH1_Base: Heli_light_03_base_F { class RHS_UH1_Base: Heli_light_03_base_F {
EGVAR(refuel,fuelCapacity) = 1447; EGVAR(refuel,fuelCapacity) = 1447;
}; };

2
addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/CfgVehicles.hpp
View File

@ -4,7 +4,7 @@ class CfgVehicles {
class Helicopter_Base_F: Helicopter { class Helicopter_Base_F: Helicopter {
class Eventhandlers; class Eventhandlers;
}; };
class Heli_Light_03_base_F: Helicopter_Base_F {}; class Heli_light_03_base_F: Helicopter_Base_F {};
class RHS_UH1_Base: Heli_light_03_base_F {}; class RHS_UH1_Base: Heli_light_03_base_F {};
class RHS_UH1Y_base: RHS_UH1_Base { class RHS_UH1Y_base: RHS_UH1_Base {
class Attributes { class Attributes {

2
addons/interaction/RscTitles.hpp
View File

@ -38,7 +38,7 @@ class ACE_Interaction_Button_Base {
}; };
class IGUIBack; class IGUIBack;
class RscListbox; class RscListBox;
class RscText; class RscText;
class RscPicture; class RscPicture;
class RscControlsGroupNoScrollbars; class RscControlsGroupNoScrollbars;

14
addons/irlight/CfgWeapons.hpp
View File

@ -103,7 +103,7 @@
class CfgWeapons { class CfgWeapons {
class acc_pointer_IR; class acc_pointer_IR;
class acc_flashlight; class acc_flashlight;
class InventoryFlashlightItem_Base_F; class InventoryFlashLightItem_Base_F;
// DBAL-A3 (red pointer) // DBAL-A3 (red pointer)
// IR Pointer + Illuminator // IR Pointer + Illuminator
@ -275,7 +275,7 @@ class CfgWeapons {
MRT_SwitchItemHintText = CSTRING(Mode_Wide); MRT_SwitchItemHintText = CSTRING(Mode_Wide);
baseWeapon = "ACE_SPIR"; baseWeapon = "ACE_SPIR";
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT(50,70); SPIR_FLASHLIGHT(50,70);
innerAngle = 20; innerAngle = 20;
@ -293,7 +293,7 @@ class CfgWeapons {
MRT_SwitchItemPrevClass = "ACE_SPIR"; MRT_SwitchItemPrevClass = "ACE_SPIR";
MRT_SwitchItemHintText = CSTRING(Mode_Medium); MRT_SwitchItemHintText = CSTRING(Mode_Medium);
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT(80,100); SPIR_FLASHLIGHT(80,100);
intensity = 100; intensity = 100;
@ -311,7 +311,7 @@ class CfgWeapons {
MRT_SwitchItemPrevClass = "ACE_SPIR_Medium"; MRT_SwitchItemPrevClass = "ACE_SPIR_Medium";
MRT_SwitchItemHintText = CSTRING(Mode_Narrow); MRT_SwitchItemHintText = CSTRING(Mode_Narrow);
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT(120,150); SPIR_FLASHLIGHT(120,150);
intensity = 200; intensity = 200;
@ -330,7 +330,7 @@ class CfgWeapons {
MRT_SwitchItemPrevClass = "ACE_SPIR_LR_Narrow"; MRT_SwitchItemPrevClass = "ACE_SPIR_LR_Narrow";
baseWeapon = "ACE_SPIR_LR"; baseWeapon = "ACE_SPIR_LR";
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT_LR(80,100); SPIR_FLASHLIGHT_LR(80,100);
innerAngle = 20; innerAngle = 20;
@ -347,7 +347,7 @@ class CfgWeapons {
MRT_SwitchItemPrevClass = "ACE_SPIR_LR"; MRT_SwitchItemPrevClass = "ACE_SPIR_LR";
MRT_SwitchItemHintText = CSTRING(Mode_Medium); MRT_SwitchItemHintText = CSTRING(Mode_Medium);
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT_LR(100,120); SPIR_FLASHLIGHT_LR(100,120);
intensity = 100; intensity = 100;
@ -364,7 +364,7 @@ class CfgWeapons {
MRT_SwitchItemPrevClass = "ACE_SPIR_LR_Medium"; MRT_SwitchItemPrevClass = "ACE_SPIR_LR_Medium";
MRT_SwitchItemHintText = CSTRING(Mode_Narrow); MRT_SwitchItemHintText = CSTRING(Mode_Narrow);
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class Flashlight { class Flashlight {
SPIR_FLASHLIGHT_LR(180,200); SPIR_FLASHLIGHT_LR(180,200);
intensity = 200; intensity = 200;

6
addons/map/CfgWeapons.hpp
View File

@ -1,10 +1,10 @@
class CfgWeapons { class CfgWeapons {
class ItemCore; class ItemCore;
class InventoryFlashlightItem_Base_F; class InventoryFlashLightItem_Base_F;
class acc_flashlight: ItemCore { class acc_flashlight: ItemCore {
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "white"; ACE_Flashlight_Colour = "white";
ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_white_ca.paa); ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_white_ca.paa);
@ -14,7 +14,7 @@ class CfgWeapons {
}; };
}; };
class acc_flashlight_pistol: ItemCore { class acc_flashlight_pistol: ItemCore {
class ItemInfo: InventoryFlashlightItem_Base_F { class ItemInfo: InventoryFlashLightItem_Base_F {
class FlashLight { class FlashLight {
ACE_Flashlight_Colour = "white"; ACE_Flashlight_Colour = "white";
ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_white_ca.paa); ACE_Flashlight_Beam = QPATHTOF(UI\Flashlight_beam_white_ca.paa);

10
addons/microdagr/gui_controls.hpp
View File

@ -116,12 +116,12 @@ class controlsBackground {
colorRocks[] = {0.50, 0.50, 0.50, 0.50}; colorRocks[] = {0.50, 0.50, 0.50, 0.50};
class hospital: Hospital {color[] = {0,0,0,0.25};}; class Hospital: Hospital {color[] = {0,0,0,0.25};};
class church: Church {color[] = {0,0,0,0.25};}; class church: church {color[] = {0,0,0,0.25};};
class lighthouse: Lighthouse {color[] = {0,0,0,0.25};}; class Lighthouse: Lighthouse {color[] = {0,0,0,0.25};};
class power: power {color[] = {0,0,0,0.25};}; class power: power {color[] = {0,0,0,0.25};};
class fuelstation: Fuelstation {color[] = {0,0,0,0.25};}; class Fuelstation: Fuelstation {color[] = {0,0,0,0.25};};
class transmitter: Transmitter {color[] = {0,0,0,0.25};}; class Transmitter: Transmitter {color[] = {0,0,0,0.25};};
}; };
class MapCompass: RscMapControlEmpty { class MapCompass: RscMapControlEmpty {

2
addons/mk6mortar/config.cpp
View File

@ -24,7 +24,7 @@ class CfgPatches {
//UI Stuff: //UI Stuff:
class RscText; class RscText;
class RscListbox; class RscListBox;
class RscListNBox; class RscListNBox;
class RscPicture; class RscPicture;
class RscControlsGroup; class RscControlsGroup;

2
addons/rearm/CfgAmmo.hpp
View File

@ -101,7 +101,7 @@ class CfgAmmo {
GVAR(dummy) = QGVAR(R_230mm_fly); GVAR(dummy) = QGVAR(R_230mm_fly);
}; };
class Sh_120mm_APFSDS: Shellbase { class Sh_120mm_APFSDS: ShellBase {
GVAR(caliber) = 120; GVAR(caliber) = 120;
}; };
class Sh_105mm_APFSDS: Sh_120mm_APFSDS { class Sh_105mm_APFSDS: Sh_120mm_APFSDS {

2
addons/vehicles/CfgVehicles.hpp
View File

@ -251,7 +251,7 @@ class CfgVehicles {
}; };
// Tanks DLC Rooikat 120 // Tanks DLC Rooikat 120
class AFV_Wheeled_01_base_F: wheeled_APC_F { class AFV_Wheeled_01_base_F: Wheeled_APC_F {
class Turrets: Turrets { class Turrets: Turrets {
class MainTurret: MainTurret { class MainTurret: MainTurret {
weapons[] = {"ACE_cannon_120mm_GT12","ACE_LMG_coax_DenelMG4"}; weapons[] = {"ACE_cannon_120mm_GT12","ACE_LMG_coax_DenelMG4"};

10
addons/zeus/ui/RscAttributes.hpp
View File

@ -1,7 +1,7 @@
class RscControlsGroup; class RscControlsGroup;
class RscControlsGroupNoScrollbars; class RscControlsGroupNoScrollbars;
class RscText; class RscText;
class RscListbox; class RscListBox;
class RscCombo; class RscCombo;
class RscEdit; class RscEdit;
class RscXSliderH; class RscXSliderH;
@ -373,7 +373,7 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes {
h = QUOTE(H_PART(1)); h = QUOTE(H_PART(1));
colorBackground[] = {0, 0, 0, 0.5}; colorBackground[] = {0, 0, 0, 0.5};
}; };
class Unit: RscListbox { class Unit: RscListBox {
idc = 16189; idc = 16189;
x = 0; x = 0;
y = QUOTE(H_PART(1.1)); y = QUOTE(H_PART(1.1));
@ -475,7 +475,7 @@ class GVAR(AttributeCargo): RscControlsGroupNoScrollbars {
class RscDisplayAttributesVehicle: RscDisplayAttributes { class RscDisplayAttributesVehicle: RscDisplayAttributes {
class Controls: Controls { class Controls: Controls {
class Content: Content { class Content: Content {
class Controls: controls { class controls: controls {
class ace_cargo: GVAR(AttributeCargo) { }; class ace_cargo: GVAR(AttributeCargo) { };
}; };
}; };
@ -485,7 +485,7 @@ class RscDisplayAttributesVehicle: RscDisplayAttributes {
class RscDisplayAttributesVehicleEmpty: RscDisplayAttributes { class RscDisplayAttributesVehicleEmpty: RscDisplayAttributes {
class Controls: Controls { class Controls: Controls {
class Content: Content { class Content: Content {
class Controls: controls { class controls: controls {
class ace_cargo: GVAR(AttributeCargo) { }; class ace_cargo: GVAR(AttributeCargo) { };
}; };
}; };
@ -542,7 +542,7 @@ class GVAR(RscGarrison): RscDisplayAttributes {
y = QUOTE(H_PART(2.2)); y = QUOTE(H_PART(2.2));
w = QUOTE(W_PART(26)); w = QUOTE(W_PART(26));
}; };
class FillingMode: RscListbox { class FillingMode: RscListBox {
idc = 73063; idc = 73063;
x = 0; x = 0;
y = QUOTE(H_PART(3.2)); y = QUOTE(H_PART(3.2));

8
include/a3/ui_f/hpp/defineResincl.inc
View File

@ -1,3 +1,5 @@
// This file was modified from the original to remove 3 duplicate defines
// check for changes when updating includes
#ifndef _RESINCL_HPP #ifndef _RESINCL_HPP
#define _RESINCL_HPP #define _RESINCL_HPP
@ -1673,8 +1675,8 @@ enum
#define IDC_MULTI_FULL_FILTER 151 #define IDC_MULTI_FULL_FILTER 151
#define IDC_MULTI_TYPE_FILTER 152 #define IDC_MULTI_TYPE_FILTER 152
#define IDC_MP_NEXT_SESSION 153 #define IDC_MP_NEXT_SESSION 153
#define IDC_MULTI_BATTLEYE_FILTER 154 // #define IDC_MULTI_BATTLEYE_FILTER 154
#define IDC_MULTI_EXPANSIONS_FILTER 155 // #define IDC_MULTI_EXPANSIONS_FILTER 155
#define IDC_MULTI_FAVORITE_COLUMN 156 #define IDC_MULTI_FAVORITE_COLUMN 156
#define IDC_MULTI_FAVORITE_ICON 157 #define IDC_MULTI_FAVORITE_ICON 157
#define IDC_MULTI_SERVER_COUNT 158 #define IDC_MULTI_SERVER_COUNT 158
@ -1696,7 +1698,7 @@ enum
#define IDC_MP_QUICK_BEST_SERVER 112 #define IDC_MP_QUICK_BEST_SERVER 112
#define IDC_MP_QUICK_FIND_SERVER 113 #define IDC_MP_QUICK_FIND_SERVER 113
#define IDC_MP_QUICK_SHOW_SERVERS 114 #define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_SHOW_SERVERS 114 // #define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_MODE_TITLE 115 #define IDC_MP_QUICK_MODE_TITLE 115
#define IDC_MP_QUICK_MODE_PICTURE 116 #define IDC_MP_QUICK_MODE_PICTURE 116
#define IDC_MP_QUICK_MODE_DESCRIPTION 117 #define IDC_MP_QUICK_MODE_DESCRIPTION 117

22
include/x/cba/addons/main/script_macros_common.hpp
View File

@ -865,15 +865,10 @@ Author:
#define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)'] #define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)']
#define VERSIONING_SYS(var1) class CfgSettings \ #define VERSIONING_SYS(var1) class CfgSettings { \
{ \ class CBA { \
class CBA \ class Versioning { \
{ \ class var1 {}; \
class Versioning \
{ \
class var1 \
{ \
}; \
}; \ }; \
}; \ }; \
}; };
@ -1040,12 +1035,9 @@ Author:
#define QQEFUNC(var1,var2) QUOTE(QEFUNC(var1,var2)) #define QQEFUNC(var1,var2) QUOTE(QEFUNC(var1,var2))
#ifndef PRELOAD_ADDONS #ifndef PRELOAD_ADDONS
#define PRELOAD_ADDONS class CfgAddons \ #define PRELOAD_ADDONS class CfgAddons { \
{ \ class PreloadAddons { \
class PreloadAddons \ class ADDON { \
{ \
class ADDON \
{ \
list[]={ QUOTE(ADDON) }; \ list[]={ QUOTE(ADDON) }; \
}; \ }; \
}; \ }; \