Skip to content

Commit 236de09

Browse files
NarcoMarshDevNarcoMarshDev
committed
Moved the check for ESE_ALIASES_ALL to ESE_Config
1 parent eabc9b9 commit 236de09

File tree

4 files changed

+47
-47
lines changed

4 files changed

+47
-47
lines changed

‎resourceDatabase.rdb‎

47 Bytes
Binary file not shown.

‎scripts/Game/!ESE_Config.c‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,14 @@
5050
//#define ESE_ALIASES_ATTACHMENTS
5151
//#define ESE_ALIASES_MAGAZINES
5252
//#define ESE_ALIASES_VEHICLES
53-
//#define ESE_ALIASES_MATH
53+
//#define ESE_ALIASES_MATH
54+
55+
// Pre-processor enable all other alias defs if ESE_ALIASES_ALL is defined
56+
#ifdef ESE_ALIASES_ALL
57+
#define ESE_ALIASES_MATERIALS
58+
#define ESE_ALIASES_WEAPONS
59+
#define ESE_ALIASES_ATTACHMENTS
60+
#define ESE_ALIASES_MAGAZINES
61+
#define ESE_ALIASES_VEHICLES
62+
#define ESE_ALIASES_MATH
63+
#endif

‎scripts/Game/ESE_Aliases.c‎

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,46 @@ class ESE_Aliases
77
{
88
// TESTING, REMOVE BEFORE RELEASE!!!
99
//#define ESE_ALIASES_ALL
10-
11-
// Pre-processor enable all other defs if ESE_ALIASES_ALL is defined
12-
#ifdef ESE_ALIASES_ALL
13-
#define ESE_ALIASES_MATERIALS
14-
#define ESE_ALIASES_WEAPONS
15-
#define ESE_ALIASES_ATTACHMENTS
16-
#define ESE_ALIASES_MAGAZINES
17-
#define ESE_ALIASES_VEHICLES
18-
#define ESE_ALIASES_MATH
19-
#endif
20-
10+
2111
// ---------------------------------------------------------------- MATERIALS ---------------------------------------------------------------- //
2212

2313
#ifdef ESE_ALIASES_MATERIALS
24-
static const ResourceName MAT_CANBUILD = "{56EBF5038622AC95}Assets/Conflict/CanBuild.emat";
14+
static const ResourceName MAT_CANBUILD = "{56EBF5038622AC95}Assets/Conflict/CanBuild.emat";
2515
static const ResourceName MAT_CANNOTBUILD = "{14A9DCEA57D1C381}Assets/Conflict/CannotBuild.emat";
2616
#endif
2717

2818
// ----------------------------------------------------------------- WEAPONS ---------------------------------------------------------------- //
2919

3020
#ifdef ESE_ALIASES_WEAPONS
3121
// RIFLES
32-
static const ResourceName WEP_AK74 = "{FA5C25BF66A53DCF}Prefabs/Weapons/Rifles/AK74/Rifle_AK74.et";
33-
static const ResourceName WEP_AK74_GP25 = "{63E8322E2ADD4AA7}Prefabs/Weapons/Rifles/AK74/Rifle_AK74_GP25.et";
22+
static const ResourceName WEP_AK74 = "{FA5C25BF66A53DCF}Prefabs/Weapons/Rifles/AK74/Rifle_AK74.et";
23+
static const ResourceName WEP_AK74_GP25 = "{63E8322E2ADD4AA7}Prefabs/Weapons/Rifles/AK74/Rifle_AK74_GP25.et";
3424
static const ResourceName WEP_M21 = "{B31929F65F0D0279}Prefabs/Weapons/Rifles/M14/Rifle_M21.et";
35-
static const ResourceName WEP_M21_ARTII = "{81EB948E6414BD6F}Prefabs/Weapons/Rifles/M14/Rifle_M21_ARTII.et";
25+
static const ResourceName WEP_M21_ARTII = "{81EB948E6414BD6F}Prefabs/Weapons/Rifles/M14/Rifle_M21_ARTII.et";
3626
static const ResourceName WEP_M16A2 = "{3E413771E1834D2F}Prefabs/Weapons/Rifles/M16/Rifle_M16A2.et";
3727
static const ResourceName WEP_M16A2_M203 = "{5A987A8A13763769}Prefabs/Weapons/Rifles/M16/Rifle_M16A2_M203.et";
38-
static const ResourceName WEP_SVD = "{3EB02CDAD5F23C82}Prefabs/Weapons/Rifles/SVD/Rifle_SVD.et";
39-
static const ResourceName WEP_SVD_PSO = "{6415B7923DE28C1B}Prefabs/Weapons/Rifles/SVD/Rifle_SVD_PSO.et";
28+
static const ResourceName WEP_SVD = "{3EB02CDAD5F23C82}Prefabs/Weapons/Rifles/SVD/Rifle_SVD.et";
29+
static const ResourceName WEP_SVD_PSO = "{6415B7923DE28C1B}Prefabs/Weapons/Rifles/SVD/Rifle_SVD_PSO.et";
4030
// LMGS
41-
static const ResourceName WEP_M249 = "{D2B48DEBEF38D7D7}Prefabs/Weapons/MachineGuns/M249/MG_M249.et";
42-
static const ResourceName WEP_M60 = "{D182DCDD72BF7E34}Prefabs/Weapons/MachineGuns/M60/MG_M60.et";
43-
static const ResourceName WEP_PKM = "{A89BC9D55FFB4CD8}Prefabs/Weapons/MachineGuns/PKM/MG_PKM.et";
31+
static const ResourceName WEP_M249 = "{D2B48DEBEF38D7D7}Prefabs/Weapons/MachineGuns/M249/MG_M249.et";
32+
static const ResourceName WEP_M60 = "{D182DCDD72BF7E34}Prefabs/Weapons/MachineGuns/M60/MG_M60.et";
33+
static const ResourceName WEP_PKM = "{A89BC9D55FFB4CD8}Prefabs/Weapons/MachineGuns/PKM/MG_PKM.et";
4434
static const ResourceName WEP_RPK74 = "{A7AF84C6C58BA3E8}Prefabs/Weapons/MachineGuns/RPK74/MG_RPK74.et";
4535
// HANDGUNS
4636
static const ResourceName WEP_M9 = "{1353C6EAD1DCFE43}Prefabs/Weapons/Handguns/M9/Handgun_M9.et";
4737
static const ResourceName WEP_PM = "{C0F7DD85A86B2900}Prefabs/Weapons/Handguns/PM/Handgun_PM.et";
4838
// LAUNCHERS
4939
static const ResourceName WEP_M72A3 = "{9C5C20FB0E01E64F}Prefabs/Weapons/Launchers/M72/Launcher_M72A3.et";
50-
static const ResourceName WEP_RPG7 = "{7A82FE978603F137}Prefabs/Weapons/Launchers/RPG7/Launcher_RPG7.et";
40+
static const ResourceName WEP_RPG7 = "{7A82FE978603F137}Prefabs/Weapons/Launchers/RPG7/Launcher_RPG7.et";
5141
// FRAG GRENADES
52-
static const ResourceName WEP_M67 = "{E8F00BF730225B00}Prefabs/Weapons/Grenades/Grenade_M67.et";
53-
static const ResourceName WEP_RGD5 = "{645C73791ECA1698}Prefabs/Weapons/Grenades/Grenade_RGD5.et";
42+
static const ResourceName WEP_M67 = "{E8F00BF730225B00}Prefabs/Weapons/Grenades/Grenade_M67.et";
43+
static const ResourceName WEP_RGD5 = "{645C73791ECA1698}Prefabs/Weapons/Grenades/Grenade_RGD5.et";
5444
// SMOKE GRENADES
5545
static const ResourceName WEP_ANM8HC = "{9DB69176CEF0EE97}Prefabs/Weapons/Grenades/Smoke_ANM8HC.et";
56-
static const ResourceName WEP_RDG2 = "{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et";
46+
static const ResourceName WEP_RDG2 = "{77EAE5E07DC4678A}Prefabs/Weapons/Grenades/Smoke_RDG2.et";
5747
static const ResourceName WEP_M18_WHITE = "{AD2709F5F6F0D871}Prefabs/Weapons/Grenades/M18/Smoke_M18_Base.et";
5848
static const ResourceName WEP_M18_GREEN = "{D41D22DD1B8E921E}Prefabs/Weapons/Grenades/M18/Smoke_M18_Green.et";
59-
static const ResourceName WEP_M18_RED = "{3343A055A83CB30D}Prefabs/Weapons/Grenades/M18/Smoke_M18_Red.et";
49+
static const ResourceName WEP_M18_RED = "{3343A055A83CB30D}Prefabs/Weapons/Grenades/M18/Smoke_M18_Red.et";
6050
static const ResourceName WEP_M18_VIOLET = "{14C1A0F061D9DDEE}Prefabs/Weapons/Grenades/M18/Smoke_M18_Violet.et";
6151
static const ResourceName WEP_M18_YELLOW = "{9BBDEE253A16CC66}Prefabs/Weapons/Grenades/M18/Smoke_M18_Yellow.et";
6252
#endif
@@ -65,16 +55,16 @@ class ESE_Aliases
6555

6656
#ifdef ESE_ALIASES_ATTACHMENTS
6757
// SCOPES
68-
static const ResourceName OPTIC_ARTII = "{D2018EDB1BBF4C88}Prefabs/Weapons/Attachments/Optics/Optic_ARTII.et";
58+
static const ResourceName OPTIC_ARTII = "{D2018EDB1BBF4C88}Prefabs/Weapons/Attachments/Optics/Optic_ARTII.et";
6959
static const ResourceName OPTIC_PSO1 = "{C850A33226B8F9C1}Prefabs/Weapons/Attachments/Optics/Optic_PSO1.et";
7060
// UGL'S
71-
static const ResourceName UGL_M203 = "{43FDAF3FA0FF2299}Prefabs/Weapons/Attachments/Underbarrel/UGL_M203.et";
72-
static const ResourceName UGL_GP25 = "{1ABABE3551512B0A}Prefabs/Weapons/Attachments/Underbarrel/UGL_GP25.et";
61+
static const ResourceName UGL_M203 = "{43FDAF3FA0FF2299}Prefabs/Weapons/Attachments/Underbarrel/UGL_M203.et";
62+
static const ResourceName UGL_GP25 = "{1ABABE3551512B0A}Prefabs/Weapons/Attachments/Underbarrel/UGL_GP25.et";
7363
// BAYONETS
7464
static const ResourceName BAYONET_M9 = "{A4AF9C38A4179880}Prefabs/Weapons/Attachments/Bayonets/Bayonet_M9.et";
75-
static const ResourceName BAYONET_6KH4 = "{C7534F7A79EA3331}Prefabs/Weapons/Attachments/Bayonets/Bayonet_6Kh4.et";
65+
static const ResourceName BAYONET_6KH4 = "{C7534F7A79EA3331}Prefabs/Weapons/Attachments/Bayonets/Bayonet_6Kh4.et";
7666
// HANDGUARDS
77-
static const ResourceName HGUARD_M16A2 = "{FB1A7F5BC7D935E2}Prefabs/Weapons/Attachments/Handguards/Handguard_M16A2/Handguard_M16.et";
67+
static const ResourceName HGUARD_M16A2 = "{FB1A7F5BC7D935E2}Prefabs/Weapons/Attachments/Handguards/Handguard_M16A2/Handguard_M16.et";
7868
#endif
7969

8070
// ----------------------------------------------------------------- MAGAZINES ---------------------------------------------------------------- //
@@ -88,30 +78,30 @@ class ESE_Aliases
8878
#ifdef ESE_ALIASES_VEHICLES
8979
// LIGHT VEHICLES
9080
static const ResourceName VEH_M151A2 = "{F649585ABB3706C4}Prefabs/Vehicles/Wheeled/M151A2/M151A2.et";
91-
static const ResourceName VEH_M151A2_TRANSPORT = "{47D94E1193A88497}Prefabs/Vehicles/Wheeled/M151A2/M151A2_transport.et";
81+
static const ResourceName VEH_M151A2_TRANSPORT = "{47D94E1193A88497}Prefabs/Vehicles/Wheeled/M151A2/M151A2_transport.et";
9282
static const ResourceName VEH_M151A2_M2HB = "{F6B23D17D5067C11}Prefabs/Vehicles/Wheeled/M151A2/M151A2_M2HB.et";
9383

9484
static const ResourceName VEH_UAZ469 = "{259EE7B78C51B624}Prefabs/Vehicles/Wheeled/UAZ469/UAZ469.et";
9585
// TRUCKS
9686
static const ResourceName VEH_M923A1 = "{9A0D72816DFFDB7F}Prefabs/Vehicles/Wheeled/M923A1/M923A1.et";
97-
static const ResourceName VEH_M923A1_TRANSPORT = "{F1FBD0972FA5FE09}Prefabs/Vehicles/Wheeled/M923A1/M923A1_transport.et";
87+
static const ResourceName VEH_M923A1_TRANSPORT = "{F1FBD0972FA5FE09}Prefabs/Vehicles/Wheeled/M923A1/M923A1_transport.et";
9888
static const ResourceName VEH_M923A1_COVERED = "{81FDAD5EB644CC3D}Prefabs/Vehicles/Wheeled/M923A1/M923A1_transport_covered.et";
99-
static const ResourceName VEH_M923A1_TANKER = "{2BE1F8B9299B67C1}Prefabs/Vehicles/Wheeled/M923A1/M923A1_tanker.et";
89+
static const ResourceName VEH_M923A1_TANKER = "{2BE1F8B9299B67C1}Prefabs/Vehicles/Wheeled/M923A1/M923A1_tanker.et";
10090
static const ResourceName VEH_M923A1_COMMAND = "{36BDCC88B17B3BFA}Prefabs/Vehicles/Wheeled/M923A1/M923A1_command.et";
101-
static const ResourceName VEH_URAL4320 = "{4597626AF36C0858}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320.et";
91+
static const ResourceName VEH_URAL4320 = "{4597626AF36C0858}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320.et";
10292
static const ResourceName VEH_URAL4320_TRANSPORT = "{16C1F16C9B053801}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_transport.et";
103-
static const ResourceName VEH_URAL4320_COVERED = "{D9B91FAB817A6033}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_transport_covered.et";
93+
static const ResourceName VEH_URAL4320_COVERED = "{D9B91FAB817A6033}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_transport_covered.et";
10494
static const ResourceName VEH_URAL4320_TANKER = "{4C81D7ED8F8C0D87}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_tanker.et";
105-
static const ResourceName VEH_URAL4320_COMMAND = "{1BABF6B33DA0AEB6}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_command.et";
95+
static const ResourceName VEH_URAL4320_COMMAND = "{1BABF6B33DA0AEB6}Prefabs/Vehicles/Wheeled/Ural4320/Ural4320_command.et";
10696
// MEDIUM VEHICLES
107-
static const ResourceName VEH_M998 = "{5674FAEB9AB7BDD0}Prefabs/Vehicles/Wheeled/M998/M998.et";
108-
static const ResourceName VEH_M998_COVERED = "{B55C6990A6A9411B}Prefabs/Vehicles/Wheeled/M998/M998_covered.et";
109-
static const ResourceName VEH_M998_COVERED_LONG = "{9B1BF9644E0378D6}Prefabs/Vehicles/Wheeled/M998/M998_covered_long.et";
97+
static const ResourceName VEH_M998 = "{5674FAEB9AB7BDD0}Prefabs/Vehicles/Wheeled/M998/M998.et";
98+
static const ResourceName VEH_M998_COVERED = "{B55C6990A6A9411B}Prefabs/Vehicles/Wheeled/M998/M998_covered.et";
99+
static const ResourceName VEH_M998_COVERED_LONG = "{9B1BF9644E0378D6}Prefabs/Vehicles/Wheeled/M998/M998_covered_long.et";
110100

111-
static const ResourceName VEH_M1025 = "{4A71F755A4513227}Prefabs/Vehicles/Wheeled/M998/M1025.et";
112-
static const ResourceName VEH_M1025_ARMED_EMPTY = "{B120CDDBEF8DB007}Prefabs/Vehicles/Wheeled/M998/M1025_armed_base.et";
113-
static const ResourceName VEH_M1025_ARMED_M2HB = "{3EA6F47D95867114}Prefabs/Vehicles/Wheeled/M998/M1025_armed_M2HB.et";
101+
static const ResourceName VEH_M1025 = "{4A71F755A4513227}Prefabs/Vehicles/Wheeled/M998/M1025.et";
102+
static const ResourceName VEH_M1025_ARMED_EMPTY = "{B120CDDBEF8DB007}Prefabs/Vehicles/Wheeled/M998/M1025_armed_base.et";
103+
static const ResourceName VEH_M1025_ARMED_M2HB = "{3EA6F47D95867114}Prefabs/Vehicles/Wheeled/M998/M1025_armed_M2HB.et";
114104

115-
static const ResourceName VEH_BTR70 = "{C012BB3488BEA0C2}Prefabs/Vehicles/Wheeled/BTR70/BTR70.et";
105+
static const ResourceName VEH_BTR70 = "{C012BB3488BEA0C2}Prefabs/Vehicles/Wheeled/BTR70/BTR70.et";
116106
#endif
117107
}

‎scripts/Game/ESE_Math.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ class ESE_Math
5757
// ================================ Obsolete ================================
5858

5959
#ifdef ESE_OBSOLETE
60-
static float FixFloat180(float val)
60+
static float _OLD_FixFloat180(float val)
6161
{
6262
if (val > 180) {val -= 360;}
6363
else if (val < -180) {val += 360;}
6464
return val;
6565
}
6666

67-
static int FixInt180(int val)
67+
static int _OLD_FixInt180(int val)
6868
{
6969
if (val > 180) {val -= 360;}
7070
else if (val < -180) {val += 360;}
7171
return val;
7272
}
7373

74-
static vector FixVector180(vector vec)
74+
static vector _OLD_FixVector180(vector vec)
7575
{
7676
for (int a = 0; a < 3; a++)
7777
{

0 commit comments

Comments
 (0)