@@ -37,70 +37,70 @@ const INVALID_TIMER = 0;
3737 * <summary>Weapons</summary>
3838 */
3939# define WEAPON: __TAG(WEAPON):
40- enum WEAPON: __WEAPON
41- {
42- UNKNOWN_WEAPON = - 1 ,
43- // Special `OnPlayerDeath` `reason` values. NOT included in `MAX_WEAPONS`.
44- REASON_VEHICLE = 49 ,
45- REASON_HELICOPTER_BLADES = 50 ,
46- REASON_EXPLOSION = 51 ,
47- REASON_DROWN = 53 ,
48- REASON_COLLISION = 54 ,
49- REASON_SPLAT = 54 ,
50- REASON_CONNECT = 200 ,
51- REASON_DISCONNECT = 201 ,
52- REASON_SUICIDE = 255 ,
53- // The main weapon types. Done after the reasons so sizes are correct.
54- WEAPON_FIST = 0 ,
55- WEAPON_BRASSKNUCKLE = 1 ,
56- WEAPON_GOLFCLUB = 2 ,
57- WEAPON_NITESTICK = 3 ,
58- WEAPON_NIGHTSTICK = WEAPON_NITESTICK,
59- WEAPON_KNIFE = 4 ,
60- WEAPON_BAT = 5 ,
61- WEAPON_SHOVEL = 6 ,
62- WEAPON_POOLSTICK = 7 ,
63- WEAPON_KATANA = 8 ,
64- WEAPON_CHAINSAW = 9 ,
65- WEAPON_DILDO = 10 ,
66- WEAPON_DILDO2 = 11 ,
67- WEAPON_VIBRATOR = 12 ,
68- WEAPON_VIBRATOR2 = 13 ,
69- WEAPON_FLOWER = 14 ,
70- WEAPON_CANE = 15 ,
71- WEAPON_GRENADE = 16 ,
72- WEAPON_TEARGAS = 17 ,
73- WEAPON_MOLTOV = 18 ,
74- WEAPON_MOLOTOV = WEAPON_MOLTOV,
75- WEAPON_COLT45 = 22 ,
76- WEAPON_SILENCED = 23 ,
77- WEAPON_DEAGLE = 24 ,
78- WEAPON_SHOTGUN = 25 ,
79- WEAPON_SAWEDOFF = 26 ,
80- WEAPON_SHOTGSPA = 27 ,
81- WEAPON_UZI = 28 ,
82- WEAPON_MP5 = 29 ,
83- WEAPON_AK47 = 30 ,
84- WEAPON_M4 = 31 ,
85- WEAPON_TEC9 = 32 ,
86- WEAPON_RIFLE = 33 ,
87- WEAPON_SNIPER = 34 ,
88- WEAPON_ROCKETLAUNCHER = 35 ,
89- WEAPON_HEATSEEKER = 36 ,
90- WEAPON_FLAMETHROWER = 37 ,
91- WEAPON_MINIGUN = 38 ,
92- WEAPON_SATCHEL = 39 ,
93- WEAPON_BOMB = 40 ,
94- WEAPON_SPRAYCAN = 41 ,
95- WEAPON_FIREEXTINGUISHER = 42 ,
96- WEAPON_CAMERA = 43 ,
97- WEAPON_NIGHT_VISION_GOGGLES = 44 ,
98- WEAPON_THERMAL_GOGGLES = 45 ,
99- WEAPON_PARACHUTE = 46
100- }
101- static stock WEAPON: _@WEAPON () { return __WEAPON; }
102-
103- # define MAX_WEAPONS __WEAPON
40+
41+ const WEAPON: UNKNOWN_WEAPON = WEAPON: - 1 ;
42+
43+ // Special `OnPlayerDeath` `reason` values. NOT included in `MAX_WEAPONS`.
44+ const WEAPON: REASON_VEHICLE = WEAPON: 49 ;
45+ const WEAPON: REASON_HELICOPTER_BLADES = WEAPON: 50 ;
46+ const WEAPON: REASON_EXPLOSION = WEAPON: 51 ;
47+ const WEAPON: REASON_DROWN = WEAPON: 53 ;
48+ const WEAPON: REASON_COLLISION = WEAPON: 54 ;
49+ const WEAPON: REASON_SPLAT = WEAPON: 54 ;
50+ const WEAPON: REASON_CONNECT = WEAPON: 200 ;
51+ const WEAPON: REASON_DISCONNECT = WEAPON: 201 ;
52+ const WEAPON: REASON_SUICIDE = WEAPON: 255 ;
53+
54+ // The main weapon types.
55+ const WEAPON: WEAPON_FIST = WEAPON: 0 ;
56+ const WEAPON: WEAPON_BRASSKNUCKLE = WEAPON: 1 ;
57+ const WEAPON: WEAPON_GOLFCLUB = WEAPON: 2 ;
58+ const WEAPON: WEAPON_NITESTICK = WEAPON: 3 ;
59+ const WEAPON: WEAPON_NIGHTSTICK = WEAPON: 3 ;
60+ const WEAPON: WEAPON_KNIFE = WEAPON: 4 ;
61+ const WEAPON: WEAPON_BAT = WEAPON: 5 ;
62+ const WEAPON: WEAPON_SHOVEL = WEAPON: 6 ;
63+ const WEAPON: WEAPON_POOLSTICK = WEAPON: 7 ;
64+ const WEAPON: WEAPON_KATANA = WEAPON: 8 ;
65+ const WEAPON: WEAPON_CHAINSAW = WEAPON: 9 ;
66+ const WEAPON: WEAPON_DILDO = WEAPON: 10 ;
67+ const WEAPON: WEAPON_DILDO2 = WEAPON: 11 ;
68+ const WEAPON: WEAPON_VIBRATOR = WEAPON: 12 ;
69+ const WEAPON: WEAPON_VIBRATOR2 = WEAPON: 13 ;
70+ const WEAPON: WEAPON_FLOWER = WEAPON: 14 ;
71+ const WEAPON: WEAPON_CANE = WEAPON: 15 ;
72+ const WEAPON: WEAPON_GRENADE = WEAPON: 16 ;
73+ const WEAPON: WEAPON_TEARGAS = WEAPON: 17 ;
74+ const WEAPON: WEAPON_MOLTOV = WEAPON: 18 ;
75+ const WEAPON: WEAPON_MOLOTOV = WEAPON: 18 ;
76+ const WEAPON: WEAPON_COLT45 = WEAPON: 22 ;
77+ const WEAPON: WEAPON_SILENCED = WEAPON: 23 ;
78+ const WEAPON: WEAPON_DEAGLE = WEAPON: 24 ;
79+ const WEAPON: WEAPON_SHOTGUN = WEAPON: 25 ;
80+ const WEAPON: WEAPON_SAWEDOFF = WEAPON: 26 ;
81+ const WEAPON: WEAPON_SHOTGSPA = WEAPON: 27 ;
82+ const WEAPON: WEAPON_UZI = WEAPON: 28 ;
83+ const WEAPON: WEAPON_MP5 = WEAPON: 29 ;
84+ const WEAPON: WEAPON_AK47 = WEAPON: 30 ;
85+ const WEAPON: WEAPON_M4 = WEAPON: 31 ;
86+ const WEAPON: WEAPON_TEC9 = WEAPON: 32 ;
87+ const WEAPON: WEAPON_RIFLE = WEAPON: 33 ;
88+ const WEAPON: WEAPON_SNIPER = WEAPON: 34 ;
89+ const WEAPON: WEAPON_ROCKETLAUNCHER = WEAPON: 35 ;
90+ const WEAPON: WEAPON_HEATSEEKER = WEAPON: 36 ;
91+ const WEAPON: WEAPON_FLAMETHROWER = WEAPON: 37 ;
92+ const WEAPON: WEAPON_MINIGUN = WEAPON: 38 ;
93+ const WEAPON: WEAPON_SATCHEL = WEAPON: 39 ;
94+ const WEAPON: WEAPON_BOMB = WEAPON: 40 ;
95+ const WEAPON: WEAPON_SPRAYCAN = WEAPON: 41 ;
96+ const WEAPON: WEAPON_FIREEXTINGUISHER = WEAPON: 42 ;
97+ const WEAPON: WEAPON_CAMERA = WEAPON: 43 ;
98+ const WEAPON: WEAPON_NIGHT_VISION_GOGGLES = WEAPON: 44 ;
99+ const WEAPON: WEAPON_THERMAL_GOGGLES = WEAPON: 45 ;
100+ const WEAPON: WEAPON_PARACHUTE = WEAPON: 46 ;
101+
102+ const WEAPON: MAX_WEAPONS = WEAPON: 47 ;
103+
104104# define WEAPON_UNKNOWN UNKNOWN_WEAPON
105105# define WEAPON_VEHICLE REASON_VEHICLE
106106# define WEAPON_DROWN REASON_DROWN
@@ -113,26 +113,24 @@ static stock WEAPON:_@WEAPON() { return __WEAPON; }
113113 * <summary>Weapon Slots</summary>
114114 */
115115# define WEAPON_SLOT: __TAG(WEAPON_SLOT):
116- enum WEAPON_SLOT: __WEAPON_SLOT
117- {
118- UNKNOWN_WEAPON_SLOT = - 1 ,
119- WEAPON_SLOT_UNARMED = 0 ,
120- WEAPON_SLOT_MELEE = 1 ,
121- WEAPON_SLOT_PISTOL = 2 ,
122- WEAPON_SLOT_SHOTGUN = 3 ,
123- WEAPON_SLOT_MACHINE_GUN = 4 ,
124- WEAPON_SLOT_ASSAULT_RIFLE = 5 ,
125- WEAPON_SLOT_LONG_RIFLE = 6 ,
126- WEAPON_SLOT_ARTILLERY = 7 ,
127- WEAPON_SLOT_EXPLOSIVES = 8 ,
128- WEAPON_SLOT_EQUIPMENT = 9 ,
129- WEAPON_SLOT_GIFT = 10 ,
130- WEAPON_SLOT_GADGET = 11 ,
131- WEAPON_SLOT_DETONATOR = 12
132- }
133- static stock WEAPON_SLOT: _@WEAPON_SLOT () { return __WEAPON_SLOT; }
134-
135- # define MAX_WEAPON_SLOTS __WEAPON_SLOT
116+
117+ const WEAPON_SLOT: UNKNOWN_WEAPON_SLOT = WEAPON_SLOT: - 1 ;
118+ const WEAPON_SLOT: WEAPON_SLOT_UNARMED = WEAPON_SLOT: 0 ;
119+ const WEAPON_SLOT: WEAPON_SLOT_MELEE = WEAPON_SLOT: 1 ;
120+ const WEAPON_SLOT: WEAPON_SLOT_PISTOL = WEAPON_SLOT: 2 ;
121+ const WEAPON_SLOT: WEAPON_SLOT_SHOTGUN = WEAPON_SLOT: 3 ;
122+ const WEAPON_SLOT: WEAPON_SLOT_MACHINE_GUN = WEAPON_SLOT: 4 ;
123+ const WEAPON_SLOT: WEAPON_SLOT_ASSAULT_RIFLE = WEAPON_SLOT: 5 ;
124+ const WEAPON_SLOT: WEAPON_SLOT_LONG_RIFLE = WEAPON_SLOT: 6 ;
125+ const WEAPON_SLOT: WEAPON_SLOT_ARTILLERY = WEAPON_SLOT: 7 ;
126+ const WEAPON_SLOT: WEAPON_SLOT_EXPLOSIVES = WEAPON_SLOT: 8 ;
127+ const WEAPON_SLOT: WEAPON_SLOT_EQUIPMENT = WEAPON_SLOT: 9 ;
128+ const WEAPON_SLOT: WEAPON_SLOT_GIFT = WEAPON_SLOT: 10 ;
129+ const WEAPON_SLOT: WEAPON_SLOT_GADGET = WEAPON_SLOT: 11 ;
130+ const WEAPON_SLOT: WEAPON_SLOT_DETONATOR = WEAPON_SLOT: 12 ;
131+
132+ const WEAPON_SLOT: MAX_WEAPON_SLOTS = WEAPON_SLOT: 13 ;
133+
136134# define WEAPON_SLOT_UNKNOWN UNKNOWN_WEAPON_SLOT
137135
138136// / <p/>
@@ -141,14 +139,11 @@ static stock WEAPON_SLOT:_@WEAPON_SLOT() { return __WEAPON_SLOT; }
141139 * <summary>Marker modes used by <c>ShowPlayerMarkers()</c></summary>
142140 */
143141# define PLAYER_MARKERS_MODE: __TAG(PLAYER_MARKERS_MODE):
144- enum PLAYER_MARKERS_MODE: __PLAYER_MARKERS_MODE
145- {
146- UNKNOWN_PLAYER_MARKERS_MODE = - 1 ,
147- PLAYER_MARKERS_MODE_OFF = 0 ,
148- PLAYER_MARKERS_MODE_GLOBAL = 1 ,
149- PLAYER_MARKERS_MODE_STREAMED = 2
150- }
151- static stock PLAYER_MARKERS_MODE: _@PLAYER_MARKERS_MODE () { return __PLAYER_MARKERS_MODE; }
142+
143+ const PLAYER_MARKERS_MODE: UNKNOWN_PLAYER_MARKERS_MODE = PLAYER_MARKERS_MODE: - 1 ;
144+ const PLAYER_MARKERS_MODE: PLAYER_MARKERS_MODE_OFF = PLAYER_MARKERS_MODE: 0 ;
145+ const PLAYER_MARKERS_MODE: PLAYER_MARKERS_MODE_GLOBAL = PLAYER_MARKERS_MODE: 1 ;
146+ const PLAYER_MARKERS_MODE: PLAYER_MARKERS_MODE_STREAMED = PLAYER_MARKERS_MODE: 2 ;
152147
153148# define PLAYER_MARKERS_MODE_UNKNOWN UNKNOWN_PLAYER_MARKERS_MODE
154149
0 commit comments