Skip to content

Commit ca17bdc

Browse files
r4sheedr4sheed
committed
Added new model variants. Changed definitions.
1 parent 9216e47 commit ca17bdc

File tree

1 file changed

+46
-7
lines changed

1 file changed

+46
-7
lines changed

‎omp_vehicle.inc

+46-7
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
6666
VEHICLE_MODEL_DUMPER = 406,
6767
VEHICLE_MODEL_FIRETRUK = 407,
6868
VEHICLE_MODEL_FIRETRUCK = VEHICLE_MODEL_FIRETRUK,
69+
VEHICLE_MODEL_FIRE_TRUCK = VEHICLE_MODEL_FIRETRUK,
6970
VEHICLE_MODEL_TRASH = 408,
7071
VEHICLE_MODEL_TRASHMASTER = VEHICLE_MODEL_TRASH,
7172
VEHICLE_MODEL_STRETCH = 409,
@@ -87,6 +88,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
8788
VEHICLE_MODEL_BOBCAT = 422,
8889
VEHICLE_MODEL_MRWHOOP = 423,
8990
VEHICLE_MODEL_MRWHOOPEE = VEHICLE_MODEL_MRWHOOP,
91+
VEHICLE_MODEL_MR_WHOOPEE = VEHICLE_MODEL_MRWHOOP,
9092
VEHICLE_MODEL_BFINJECT = 424,
9193
VEHICLE_MODEL_BFINJECTION = VEHICLE_MODEL_BFINJECT,
9294
VEHICLE_MODEL_BF_INJECTION = VEHICLE_MODEL_BFINJECT,
@@ -110,6 +112,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
110112
VEHICLE_MODEL_STALLION = 439,
111113
VEHICLE_MODEL_RUMPO = 440,
112114
VEHICLE_MODEL_RCBANDIT = 441,
115+
VEHICLE_MODEL_RC_BANDIT = 441,
113116
VEHICLE_MODEL_ROMERO = 442,
114117
VEHICLE_MODEL_PACKER = 443,
115118
VEHICLE_MODEL_MONSTER = 444,
@@ -131,14 +134,18 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
131134
VEHICLE_MODEL_CADDY = 457,
132135
VEHICLE_MODEL_SOLAIR = 458,
133136
VEHICLE_MODEL_TOPFUN = 459,
137+
VEHICLE_MODEL_TOPFUN_VAN = VEHICLE_MODEL_TOPFUN,
134138
VEHICLE_MODEL_BERKLEYSRCVAN = VEHICLE_MODEL_TOPFUN,
135139
VEHICLE_MODEL_BERKLEYS_RC_VAN = VEHICLE_MODEL_TOPFUN,
136140
VEHICLE_MODEL_SKIMMER = 460,
137141
VEHICLE_MODEL_PCJ600 = 461,
142+
VEHICLE_MODEL_PCJ_600 = VEHICLE_MODEL_PCJ600,
138143
VEHICLE_MODEL_FAGGIO = 462,
139144
VEHICLE_MODEL_FREEWAY = 463,
140145
VEHICLE_MODEL_RCBARON = 464,
146+
VEHICLE_MODEL_RC_BARON = VEHICLE_MODEL_RCBARON,
141147
VEHICLE_MODEL_RCRAIDER = 465,
148+
VEHICLE_MODEL_RC_RAIDER = VEHICLE_MODEL_RCRAIDER,
142149
VEHICLE_MODEL_GLENDALE = 466,
143150
VEHICLE_MODEL_OCEANIC = 467,
144151
VEHICLE_MODEL_SANCHEZ = 468,
@@ -152,6 +159,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
152159
VEHICLE_MODEL_SABRE = 475,
153160
VEHICLE_MODEL_RUSTLER = 476,
154161
VEHICLE_MODEL_ZR350 = 477,
162+
VEHICLE_MODEL_ZR_350 = VEHICLE_MODEL_ZR350,
155163
VEHICLE_MODEL_WALTON = 478,
156164
VEHICLE_MODEL_REGINA = 479,
157165
VEHICLE_MODEL_COMET = 480,
@@ -163,10 +171,13 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
163171
VEHICLE_MODEL_DOZER = 486,
164172
VEHICLE_MODEL_MAVERICK = 487,
165173
VEHICLE_MODEL_VCNMAV = 488,
174+
VEHICLE_MODEL_VCN_MAVERICK = VEHICLE_MODEL_VCNMAV,
166175
VEHICLE_MODEL_SANNEWSMAVERICK = VEHICLE_MODEL_VCNMAV,
167176
VEHICLE_MODEL_SAN_NEWS_MAVERICK = VEHICLE_MODEL_VCNMAV,
177+
VEHICLE_MODEL_NEWS_CHOPPER = VEHICLE_MODEL_VCNMAV,
168178
VEHICLE_MODEL_RANCHER = 489,
169179
VEHICLE_MODEL_FBIRANCHER = 490,
180+
VEHICLE_MODEL_FBI_RANCHER = VEHICLE_MODEL_FBIRANCHER,
170181
VEHICLE_MODEL_VIRGO = 491,
171182
VEHICLE_MODEL_GREENWOO = 492,
172183
VEHICLE_MODEL_GREENWOOD = VEHICLE_MODEL_GREENWOO,
@@ -185,6 +196,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
185196
VEHICLE_MODEL_BENSON = 499,
186197
VEHICLE_MODEL_MESA = 500,
187198
VEHICLE_MODEL_RCGOBLIN = 501,
199+
VEHICLE_MODEL_RC_GOBLIN = VEHICLE_MODEL_RCGOBLIN,
188200
VEHICLE_MODEL_HOTRINA = 502,
189201
VEHICLE_MODEL_HOTRINGRACERA = VEHICLE_MODEL_HOTRINA,
190202
VEHICLE_MODEL_HOTRING_RACER_A = VEHICLE_MODEL_HOTRINA,
@@ -222,12 +234,16 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
222234
VEHICLE_MODEL_SHAMAL = 519,
223235
VEHICLE_MODEL_HYDRA = 520,
224236
VEHICLE_MODEL_FCR900 = 521,
237+
VEHICLE_MODEL_FCR_900 = VEHICLE_MODEL_FCR900,
225238
VEHICLE_MODEL_NRG500 = 522,
239+
VEHICLE_MODEL_NRG_500 = VEHICLE_MODEL_NRG500,
226240
VEHICLE_MODEL_HPV1000 = 523,
241+
VEHICLE_MODEL_HPV_1000 = VEHICLE_MODEL_HPV1000,
227242
VEHICLE_MODEL_CEMENT = 524,
228243
VEHICLE_MODEL_CEMENTTRUCK = VEHICLE_MODEL_CEMENT,
229244
VEHICLE_MODEL_CEMENT_TRUCK = VEHICLE_MODEL_CEMENT,
230245
VEHICLE_MODEL_TOWTRUCK = 525,
246+
VEHICLE_MODEL_TOW_TRUCK = VEHICLE_MODEL_TOWTRUCK,
231247
VEHICLE_MODEL_FORTUNE = 526,
232248
VEHICLE_MODEL_CADRONA = 527,
233249
VEHICLE_MODEL_FBITRUCK = 528,
@@ -236,14 +252,17 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
236252
VEHICLE_MODEL_FORKLIFT = 530,
237253
VEHICLE_MODEL_TRACTOR = 531,
238254
VEHICLE_MODEL_COMBINE = 532,
255+
VEHICLE_MODEL_COMBINE_HARVESTER = VEHICLE_MODEL_COMBINE,
239256
VEHICLE_MODEL_FELTZER = 533,
240257
VEHICLE_MODEL_REMINGTN = 534,
241258
VEHICLE_MODEL_REMINGTON = VEHICLE_MODEL_REMINGTN,
242259
VEHICLE_MODEL_SLAMVAN = 535,
243260
VEHICLE_MODEL_BLADE = 536,
244261
VEHICLE_MODEL_FREIGHT = 537,
262+
VEHICLE_MODEL_FREIGHT_TRAIN = VEHICLE_MODEL_FREIGHT,
245263
VEHICLE_MODEL_STREAK = 538,
246264
VEHICLE_MODEL_BROWNSTREAK = VEHICLE_MODEL_STREAK,
265+
VEHICLE_MODEL_BROWNSTREAK_TRAIN = VEHICLE_MODEL_STREAK,
247266
VEHICLE_MODEL_VORTEX = 539,
248267
VEHICLE_MODEL_VINCENT = 540,
249268
VEHICLE_MODEL_BULLET = 541,
@@ -252,6 +271,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
252271
VEHICLE_MODEL_FIRELA = 544,
253272
VEHICLE_MODEL_FIRETRUCKLA = VEHICLE_MODEL_FIRELA,
254273
VEHICLE_MODEL_FIRETRUCK_LA = VEHICLE_MODEL_FIRELA,
274+
VEHICLE_MODEL_FIRE_TRUCK_LA = VEHICLE_MODEL_FIRELA,
255275
VEHICLE_MODEL_HUSTLER = 545,
256276
VEHICLE_MODEL_INTRUDER = 546,
257277
VEHICLE_MODEL_PRIMO = 547,
@@ -277,6 +297,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
277297
VEHICLE_MODEL_RAINDANC = 563,
278298
VEHICLE_MODEL_RAINDANCE = VEHICLE_MODEL_RAINDANC,
279299
VEHICLE_MODEL_RCTIGER = 564,
300+
VEHICLE_MODEL_RC_TIGER = VEHICLE_MODEL_RCTIGER,
280301
VEHICLE_MODEL_FLASH = 565,
281302
VEHICLE_MODEL_TAHOMA = 566,
282303
VEHICLE_MODEL_SAVANNA = 567,
@@ -292,15 +313,20 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
292313
VEHICLE_MODEL_KART = 571,
293314
VEHICLE_MODEL_MOWER = 572,
294315
VEHICLE_MODEL_DUNERIDE = 573,
316+
VEHICLE_MODEL_DUNE = VEHICLE_MODEL_DUNERIDE,
295317
VEHICLE_MODEL_SWEEPER = 574,
296318
VEHICLE_MODEL_BROADWAY = 575,
297319
VEHICLE_MODEL_TORNADO = 576,
298320
VEHICLE_MODEL_AT400 = 577,
321+
VEHICLE_MODEL_AT_400 = VEHICLE_MODEL_AT400,
299322
VEHICLE_MODEL_DFT30 = 578,
323+
VEHICLE_MODEL_DFT_30 = VEHICLE_MODEL_DFT30,
300324
VEHICLE_MODEL_HUNTLEY = 579,
301325
VEHICLE_MODEL_STAFFORD = 580,
302326
VEHICLE_MODEL_BF400 = 581,
327+
VEHICLE_MODEL_BF_400 = VEHICLE_MODEL_BF400,
303328
VEHICLE_MODEL_NEWSVAN = 582,
329+
VEHICLE_MODEL_NEWS_VAN = VEHICLE_MODEL_NEWSVAN,
304330
VEHICLE_MODEL_TUG = 583,
305331
VEHICLE_MODEL_PETROTR = 584,
306332
VEHICLE_MODEL_PETROLTRAILER = VEHICLE_MODEL_PETROTR,
@@ -321,6 +347,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
321347
VEHICLE_MODEL_ANDROMADA = VEHICLE_MODEL_ANDROM,
322348
VEHICLE_MODEL_DODO = 593,
323349
VEHICLE_MODEL_RCCAM = 594,
350+
VEHICLE_MODEL_RC_CAM = VEHICLE_MODEL_RCCAM,
324351
VEHICLE_MODEL_LAUNCH = 595,
325352
VEHICLE_MODEL_LSPD = 596,
326353
VEHICLE_MODEL_COPCARLA = VEHICLE_MODEL_LSPD,
@@ -340,6 +367,7 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
340367
VEHICLE_MODEL_POLICE_RANGER = VEHICLE_MODEL_COPCARRU,
341368
VEHICLE_MODEL_PICADOR = 600,
342369
VEHICLE_MODEL_SWATVAN = 601,
370+
VEHICLE_MODEL_SWAT_VAN = VEHICLE_MODEL_SWATVAN,
343371
VEHICLE_MODEL_SWAT = VEHICLE_MODEL_SWATVAN,
344372
VEHICLE_MODEL_ALPHA = 602,
345373
VEHICLE_MODEL_PHOENIX = 603,
@@ -354,25 +382,36 @@ enum VEHICLE_MODEL:__VEHICLE_MODELS
354382
VEHICLE_MODEL_BAGGAGETRAILERB = 607,
355383
VEHICLE_MODEL_BAGGAGE_TRAILER_B = VEHICLE_MODEL_BAGGAGETRAILERB,
356384
VEHICLE_MODEL_TUGSTAIR = 608,
357-
VEHICLE_MODEL_TUGSTAIRSTRAILER = VEHICLE_MODEL_TUGSTAIR,
358-
VEHICLE_MODEL_TUGSTAIRS_TRAILER = VEHICLE_MODEL_TUGSTAIR,
385+
VEHICLE_MODEL_STAIRS_TRAILER = VEHICLE_MODEL_TUGSTAIR,
359386
VEHICLE_MODEL_BOXBURG = 609,
387+
VEHICLE_MODEL_BURGLARY_BOXVILLE = VEHICLE_MODEL_BOXBURG,
360388
VEHICLE_MODEL_FARMTRAILER = 610,
361389
VEHICLE_MODEL_FARM_TRAILER = VEHICLE_MODEL_FARMTRAILER,
362390
VEHICLE_MODEL_UTILITYTRAILER = 611,
363391
VEHICLE_MODEL_UTILITY_TRAILER = VEHICLE_MODEL_UTILITYTRAILER
364392
}
365393
static stock VEHICLE_MODEL:_@VEHICLE_MODEL() { return __VEHICLE_MODELS; }
366394

367-
#define VEHICLE_MODELS_MIN (_:VEHICLE_MODEL_LANDSTAL)
368-
#define VEHICLE_MODELS_MAX (_:VEHICLE_MODEL_UTILITYTRAILER)
369-
#define VEHICLE_MODELS_COUNT (VEHICLE_MODELS_MAX - VEHICLE_MODELS_MIN + 1)
395+
/**
396+
* <library>omp_vehicle</library>
397+
*/
398+
const VEHICLE_MODELS_MIN = 400;
399+
400+
/**
401+
* <library>omp_vehicle</library>
402+
*/
403+
const VEHICLE_MODELS_MAX = 611;
404+
405+
/**
406+
* <library>omp_vehicle</library>
407+
*/
408+
const VEHICLE_MODELS_COUNT = (VEHICLE_MODELS_MAX - VEHICLE_MODELS_MIN + 1);
370409

371410
/**
372411
* <library>omp_vehicle</library>
373412
*/
374-
const MAX_VEHICLE_MODELS = VEHICLE_MODELS_COUNT;
375-
#define MAX_VEHICLE_MODELS VEHICLE_MODELS_COUNT
413+
const MAX_VEHICLE_MODELS = VEHICLE_MODELS_COUNT;
414+
#define MAX_VEHICLE_MODELS VEHICLE_MODELS_COUNT
376415

377416
/// <p/>
378417
/**

0 commit comments

Comments
 (0)