diff options
Diffstat (limited to '')
| -rw-r--r-- | src/modelinfo/ModelIndices.h | 198 |
1 files changed, 128 insertions, 70 deletions
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h index cc6ed25c..21362c54 100644 --- a/src/modelinfo/ModelIndices.h +++ b/src/modelinfo/ModelIndices.h @@ -1,5 +1,7 @@ #pragma once +#include "ModelInfo.h" + #define MODELINDICES \ X("fire_hydrant", MI_FIRE_HYDRANT, 0x5F5A00) \ X("bagelstnd02", MI_BAGELSTAND2, 0x5F59FC) \ @@ -47,37 +49,37 @@ X("package1", MI_COLLECTABLE1, 0x5F5A04) \ X("Money", MI_MONEY, 0x5F5A08) \ X("barrel1", MI_CARMINE, 0x5F5A0C) \ - X("oddjgaragdoor", MI_GARAGEDOOR1, 0x5F5A10) \ - X("bombdoor", MI_GARAGEDOOR2, 0x5F5A14) \ - X("door_bombshop", MI_GARAGEDOOR3, 0x5F5A18) \ - X("vheistlocdoor", MI_GARAGEDOOR4, 0x5F5A1C) \ - X("door2_garage", MI_GARAGEDOOR5, 0x5F5A20) \ - X("ind_slidedoor", MI_GARAGEDOOR6, 0x5F5A24) \ - X("bankjobdoor", MI_GARAGEDOOR7, 0x5F5A28) \ - X("door_jmsgrage", MI_GARAGEDOOR9, 0x5F5A2C) \ - X("jamesgrge_kb", MI_GARAGEDOOR10, 0x5F5A30) \ - X("door_sfehousegrge", MI_GARAGEDOOR11, 0x5F5A34) \ - X("shedgaragedoor", MI_GARAGEDOOR12, 0x5F5A38) \ - X("door4_garage", MI_GARAGEDOOR13, 0x5F5A3C) \ - X("door_col_compnd_01", MI_GARAGEDOOR14, 0x5F5A40) \ - X("door_col_compnd_02", MI_GARAGEDOOR15, 0x5F5A44) \ - X("door_col_compnd_03", MI_GARAGEDOOR16, 0x5F5A48) \ - X("door_col_compnd_04", MI_GARAGEDOOR17, 0x5F5A4C) \ - X("door_col_compnd_05", MI_GARAGEDOOR18, 0x5F5A50) \ - X("impex_door", MI_GARAGEDOOR19, 0x5F5A54) \ - X("SalvGarage", MI_GARAGEDOOR20, 0x5F5A58) \ - X("door3_garage", MI_GARAGEDOOR21, 0x5F5A5C) \ - X("leveldoor2", MI_GARAGEDOOR22, 0x5F5A60) \ - X("double_garage_dr", MI_GARAGEDOOR23, 0x5F5A64) \ - X("amcogaragedoor", MI_GARAGEDOOR24, 0x5F5A68) \ - X("towergaragedoor1", MI_GARAGEDOOR25, 0x5F5A6C) \ - X("towergaragedoor2", MI_GARAGEDOOR26, 0x5F5A70) \ - X("towergaragedoor3", MI_GARAGEDOOR27, 0x5F5A74) \ - X("plysve_gragedoor", MI_GARAGEDOOR28, 0x5F5A78) \ - X("impexpsubgrgdoor", MI_GARAGEDOOR29, 0x5F5A7C) \ - X("Sub_sprayshopdoor", MI_GARAGEDOOR30, 0x5F5A80) \ - X("ind_plyrwoor", MI_GARAGEDOOR31, 0x5F5A84) \ - X("8ballsuburbandoor", MI_GARAGEDOOR32, 0x5F5A88) \ + /*X("oddjgaragdoor", MI_GARAGEDOOR1, 0x5F5A10)*/ \ + X("dk_paynspraydoor", MI_GARAGEDOOR2, 0x5F5A14) \ + X("dk_waretankdoor1", MI_GARAGEDOOR3, 0x5F5A18) \ + X("hav_garagedoor1", MI_GARAGEDOOR4, 0x5F5A1C) \ + X("hav_garagedoor02", MI_GARAGEDOOR5, 0x5F5A20) \ + X("hav_garagedoor03", MI_GARAGEDOOR6, 0x5F5A24) \ + X("hav_garagedoor04", MI_GARAGEDOOR7, 0x5F5A28) \ + X("lh_showdoor03", MI_GARAGEDOOR9, 0x5F5A2C) \ + X("lh_showdoor1", MI_GARAGEDOOR10, 0x5F5A30) \ + X("lhtankdoor", MI_GARAGEDOOR11, 0x5F5A34) \ + X("nbtgardoor", MI_GARAGEDOOR12, 0x5F5A38) \ + X("dk_camjonesdoor", MI_GARAGEDOOR13, 0x5F5A3C) \ + X("nbtgardoor02", MI_GARAGEDOOR14, 0x5F5A40) \ + X("dt_savedra", MI_GARAGEDOOR15, 0x5F5A44) \ + X("dt_savedrb", MI_GARAGEDOOR16, 0x5F5A48) \ + /*X("dk_bombdoor", MI_GARAGEDOOR17, 0x5F5A4C)*/ \ + X("dk_bombdoor", MI_GARAGEDOOR18, 0x5F5A50) \ + X("haiwshpnsdoor", MI_GARAGEDOOR19, 0x5F5A54) \ + X("wshpnsdoor", MI_GARAGEDOOR20, 0x5F5A58) \ + X("nbecpnsdoor", MI_GARAGEDOOR21, 0x5F5A5C) \ + X("nbtgardoor03", MI_GARAGEDOOR22, 0x5F5A60) \ + X("dt_savedrc", MI_GARAGEDOOR23, 0x5F5A64) \ + X("dt_savedrd", MI_GARAGEDOOR24, 0x5F5A68) \ + X("man_frntstepGD", MI_GARAGEDOOR25, 0x5F5A6C) \ + X("svegrgedoor", MI_GARAGEDOOR26, 0x5F5A70) \ + /*X("towergaragedoor3", MI_GARAGEDOOR27, 0x5F5A74)*/ \ + /*X("plysve_gragedoor", MI_GARAGEDOOR28, 0x5F5A78)*/ \ + /*X("impexpsubgrgdoor", MI_GARAGEDOOR29, 0x5F5A7C)*/ \ + /*X("Sub_sprayshopdoor", MI_GARAGEDOOR30, 0x5F5A80)*/ \ + /*X("ind_plyrwoor", MI_GARAGEDOOR31, 0x5F5A84)*/ \ + /*X("8ballsuburbandoor", MI_GARAGEDOOR32, 0x5F5A88)*/ \ X("barrel2", MI_NAUTICALMINE, 0x5F5A8C) \ X("crushercrush", MI_CRUSHERBODY, 0x5F5A90) \ X("crushertop", MI_CRUSHERLID, 0x5F5A94) \ @@ -174,6 +176,21 @@ enum MI_MEDIC, MI_FIREMAN, MI_MALE01, + + MI_TAXI_D = 28, // HMOCA + MI_GANG01 = 83, // CBa + MI_VICE1 = 97, + MI_VICE2, + MI_VICE3, + MI_VICE4, + MI_VICE5, + MI_VICE6, + MI_VICE7, + MI_VICE8, + MI_WFYG2 = 106, // last regular ped + MI_SPECIAL01 = 109, + MI_SPECIAL21 = 129, +/* MI_TAXI_D, MI_PIMP, MI_GANG01, @@ -254,21 +271,22 @@ enum MI_BUSKER3, MI_BUSKER4, // three more peds possible +*/ - MI_FIRST_VEHICLE = 90, + MI_FIRST_VEHICLE = 130, MI_LANDSTAL = MI_FIRST_VEHICLE, MI_IDAHO, MI_STINGER, MI_LINERUN, MI_PEREN, MI_SENTINEL, - MI_PATRIOT, + MI_RIO, MI_FIRETRUCK, MI_TRASH, MI_STRETCH, MI_MANANA, MI_INFERNUS, - MI_BLISTA, + MI_VOODOO, MI_PONY, MI_MULE, MI_CHEETAH, @@ -277,11 +295,11 @@ enum MI_MOONBEAM, MI_ESPERANT, MI_TAXI, - MI_KURUMA, + MI_WASHING, MI_BOBCAT, MI_MRWHOOP, MI_BFINJECT, - MI_CORPSE, + MI_HUNTER, MI_POLICE, MI_ENFORCER, MI_SECURICA, @@ -290,40 +308,84 @@ enum MI_BUS, MI_RHINO, MI_BARRACKS, - MI_TRAIN, + MI_CUBAN, MI_CHOPPER, - MI_DODO, + MI_ANGEL, MI_COACH, MI_CABBIE, MI_STALLION, MI_RUMPO, MI_RCBANDIT, - MI_BELLYUP, - MI_MRWONGS, - MI_MAFIA, - MI_YARDIE, - MI_YAKUZA, - MI_DIABLOS, - MI_COLUMB , - MI_HOODS, + MI_ROMERO, + MI_PACKER, + MI_SENTXS, + MI_ADMIRAL, + MI_SQUALO, + MI_SEASPAR, + MI_PIZZABOY, + MI_GANGBUR, MI_AIRTRAIN, MI_DEADDODO, MI_SPEEDER, MI_REEFER, - MI_PANLANT, + MI_TROPIC, MI_FLATBED, MI_YANKEE, - MI_ESCAPE, - MI_BORGNINE, - MI_TOYZ, - MI_GHOST, - - // leftovers on PC - MI_MIAMI_RCBARON = 154, - MI_MIAMI_RCRAIDER = 155, - MI_MIAMI_SPARROW = 159, + MI_CADDY, + MI_ZEBRA, + MI_TOPFUN, + MI_SKIMMER, + MI_PCJ600, + MI_FAGGIO, + MI_FREEWAY, + MI_RCBARON, + MI_RCRAIDER, + MI_GLENDALE, + MI_OCEANIC, + MI_SANCHEZ, + MI_SPARROW, + MI_PATRIOT, + MI_LOVEFIST, + MI_COASTG, + MI_DINGHY, + MI_HERMES, + MI_SABRE, + MI_SABRETUR, + MI_PHEONIX, + MI_WALTON, + MI_REGINA, + MI_COMET, + MI_DELUXO, + MI_BURRITO, + MI_SPAND, + MI_MARQUIS, + MI_BAGGAGE, + MI_KAUFMAN, + MI_MAVERICK, + MI_VCNMAV, + MI_RANCHER, + MI_FBIRANCH, + MI_VIRGO, + MI_GREENWOO, + MI_JETMAX, + MI_HOTRING, + MI_SANDKING, + MI_BLISTAC, + MI_POLMAV, + MI_BOXVILLE, + MI_BENSON, + MI_MESA, + MI_RCGOBLIN, + MI_HOTRINA, + MI_HOTRINB, + MI_BLOODRA, + MI_BLOODRB, + MI_VICECHEE, + // HACK + MI_TRAIN = -1, + MI_DODO = -2, - MI_GRENADE = 170, + MI_GRENADE = 258, MI_AK47, MI_BASEBALL_BAT, MI_COLT, @@ -338,13 +400,13 @@ enum MI_BOMB, MI_FINGERS, - MI_CUTOBJ01 = 185, + MI_CUTOBJ01 = 295, MI_CUTOBJ02, MI_CUTOBJ03, MI_CUTOBJ04, MI_CUTOBJ05, - MI_CAR_DOOR = 190, + MI_CAR_DOOR = 240, MI_CAR_BUMPER, MI_CAR_PANEL, MI_CAR_BONNET, @@ -353,10 +415,10 @@ enum MI_BODYPARTA, MI_BODYPARTB, - MI_AIRTRAIN_VLO = 198, - MI_LOPOLYGUY, + MI_AIRTRAIN_VLO = 257, +// MI_LOPOLYGUY, - NUM_DEFAULT_MODELS + NUM_DEFAULT_MODELS = 300 // MIAMI }; enum{ @@ -371,14 +433,8 @@ void TestModelIndices(void); inline bool IsGlass(int16 id) { - return id == MI_GLASS1 || - id == MI_GLASS2 || - id == MI_GLASS3 || - id == MI_GLASS4 || - id == MI_GLASS5 || - id == MI_GLASS6 || - id == MI_GLASS7 || - id == MI_GLASS8; + CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id); + return mi->IsBuilding() && (mi->m_isCodeGlass || mi->m_isArtistGlass); } inline bool @@ -398,6 +454,7 @@ IsBodyPart(int16 id) } // This is bad and should perhaps not be used +/* inline bool IsBoatModel(int16 id) { @@ -406,6 +463,7 @@ IsBoatModel(int16 id) id == MI_SPEEDER || id == MI_GHOST; } +*/ inline bool IsPedModel(int16 id) |