Skip to content

Commit 7a9639b

Browse files
committed
Removed kneepad variants
1 parent 6721550 commit 7a9639b

File tree

5 files changed

+0
-73
lines changed

5 files changed

+0
-73
lines changed

addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ class ace_wardrobe {
88
class ACEWARDROBE(base_H_goggles_off);
99
class ACEWARDROBE(base_U_tie_on);
1010
class ACEWARDROBE(base_U_tie_off);
11-
class ACEWARDROBE(base_U_kneepads_on);
12-
class ACEWARDROBE(base_U_kneepads_off);
1311

1412
#include "ACE_wardrobe_uniforms.hpp"
1513
#include "ACE_wardrobe_headgear.hpp"

addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe_uniforms.hpp

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -81,60 +81,6 @@ UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_M40_Gaiters_closed,U_
8181
UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_Gaiters_closed,U_SPE_ST_Soldier_Gaiters,U_SPE_ST_Soldier_rolled);
8282
UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_Boots,U_SPE_ST_Soldier_Boots_open,U_SPE_ST_Soldier_Boots_rolled);
8383

84-
// Paratrooper kneepads
85-
class U_SPE_FSJ_mk1: ACEWARDROBE(base_U_kneepads_off) {
86-
class modifiableTo {
87-
class U_SPE_FSJ_mk1_pads {
88-
directionalActionName = ACEWARDROBE_CSTRING(kneepadsOn);
89-
};
90-
};
91-
};
92-
class U_SPE_FSJ_mk1_pads: ACEWARDROBE(base) {
93-
class modifiableTo {
94-
class U_SPE_FSJ_mk1 {};
95-
class U_SPE_FSJ_mk1_gloves_pads {};
96-
};
97-
};
98-
class U_SPE_FSJ_mk1_gloves_pads: ACEWARDROBE(base_U_gloves_on) {
99-
class modifiableTo {
100-
class U_SPE_FSJ_mk1_pads {
101-
directionalActionName = ACEWARDROBE_CSTRING(glovesOff);
102-
};
103-
};
104-
};
105-
106-
class U_SPE_FSJ_mk1_pads_roll: ACEWARDROBE(base_U_kneepads_on) {
107-
class modifiableTo {
108-
class U_SPE_FSJ_mk1_roll {
109-
directionalActionName = ACEWARDROBE_CSTRING(kneepadsOff);
110-
};
111-
};
112-
};
113-
class U_SPE_FSJ_mk1_roll: ACEWARDROBE(base) {
114-
class modifiableTo {
115-
class U_SPE_FSJ_mk1_gloves {};
116-
class U_SPE_FSJ_mk1_pads_roll {};
117-
};
118-
};
119-
class U_SPE_FSJ_mk1_gloves: ACEWARDROBE(base_U_gloves_on) {
120-
class modifiableTo {
121-
class U_SPE_FSJ_mk1_roll {
122-
directionalActionName = ACEWARDROBE_CSTRING(glovesOff);
123-
};
124-
};
125-
};
126-
127-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_split_pads,U_SPE_FSJ_mk2_split);
128-
129-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk3_split_pads,U_SPE_FSJ_mk3_split);
130-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk3_split_pads_roll,U_SPE_FSJ_mk3_split_trop_roll);
131-
132-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk1_offz_pads,U_SPE_FSJ_mk1_offz);
133-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk1_offz_gloves_pads,U_SPE_FSJ_mk1_offz_gloves);
134-
135-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_offz_pads,U_SPE_FSJ_mk2_offz);
136-
UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_offz_gloves_pads,U_SPE_FSJ_mk2_offz_gloves);
137-
13884
// Blouse pilot pants
13985
BASE_PAIR(U_SPE_GER_LW_pilot,U_SPE_GER_LW_pilot_alt);
14086
BASE_PAIR(U_SPE_GER_LW_pilot_trop,U_SPE_GER_LW_pilot_trop_alt);

addons/wardrobe/ACE_Wardrobe_BaseClasses.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ class GVAR(base_U_tie_off): GVAR(base) {
5555
alternativeActionName = CSTRING(tieOff);
5656
};
5757

58-
// Common base class for uniforms with kneepads on/off variants
59-
class GVAR(base_U_kneepads_on): GVAR(base) {
60-
alternativeActionName = CSTRING(kneepadsOn);
61-
};
62-
class GVAR(base_U_kneepads_off): GVAR(base) {
63-
alternativeActionName = CSTRING(kneepadsOff);
64-
};
65-
6658
// Common base class for uniforms who are open/closed in the front
6759
class GVAR(base_U_jacket_open): GVAR(base) {
6860
alternativeActionName = CSTRING(jacketOpen);

addons/wardrobe/script_macros_wardrobe.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ BASIC(variantHoodRaised,variantHoodLowered,ACEWARDROBE(base_U_hood_raised),ACEWA
220220
#define UNIFORM_TIE(varianTieOn,variantTieOff)\
221221
BASIC(varianTieOn,variantTieOff,ACEWARDROBE(base_U_tie_on),ACEWARDROBE(base_U_tie_off))
222222

223-
#define UNIFORM_KNEEPADS(variantKneepadsOn,variantKneepadsOff)\
224-
BASIC(variantKneepadsOn,variantKneepadsOff,ACEWARDROBE(base_U_kneepads_on),ACEWARDROBE(base_U_kneepads_off))
225-
226223
// Uniform with Variants for Gloves, Rolled Up and Combined Gloves+Rolled Up
227224
#define UNIFORM_GLOVES_ROLLED(UniformBase,UniformGloves,UniformRolled,UniformGlovesRolled)\
228225
class UniformBase: ACEWARDROBE(base) {\

addons/wardrobe/stringtable.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@
9090
<Russian>Растегнуть куртку</Russian>
9191
<Japanese>ジャケットを開く</Japanese>
9292
</Key>
93-
<Key ID="STR_ACE_Wardrobe_kneepadsOff">
94-
<English>Take kneepads off</English>
95-
</Key>
96-
<Key ID="STR_ACE_Wardrobe_kneepadsOn">
97-
<English>Put kneepads on</English>
98-
</Key>
9993
<Key ID="STR_ACE_Wardrobe_maskOff">
10094
<English>Take mask off</English>
10195
<French>Enlevez votre masque</French>

0 commit comments

Comments
 (0)