diff --git a/src/miami/core/FileLoader.cpp b/src/miami/core/FileLoader.cpp index b9da8fec..b0d3104d 100644 --- a/src/miami/core/FileLoader.cpp +++ b/src/miami/core/FileLoader.cpp @@ -698,13 +698,51 @@ CFileLoader::LoadObjectTypes(const char *filename) //find . -type f -name "*rail*.dff" ! -name "*shad*" //find . -type f -name "*veg*.dff" ! -name "*shad*" char *AlphaTestNames[] = { + "BillBd04", + "BillBd1", + "BillBd2", + "BillBd3", + "LODk_grassarea", + "LODmrgtrees4", + "LODo_polgrnda10", + "LODo_polgrnda12", + "LODo_polgrnda13", + "LODo_polgrnda14", + "LODo_polgrnda16", + "LODo_polgrnda17", + "LODo_polgrnda7", + "LODo_polgrnda8", + "LODo_polgrnda9", + "LODrtrees1", + "LODrtrees2", + "LODrtrees3", + "LODrtrees4", + "LODrtrees5", + "LODse_pierfence", + "LODst_woodfence30", + "Man3_base_hedge", + "Mansion2_C_fence", + "Rose_Bush01", + "Rose_Bush03", + "Starhouse", + "Streetlamp1", + "Streetlamp2", + "ap_blastdef_01", + "ap_blastdef_03", + "ap_boardshad1", "ap_carbush2_01", "ap_planters1_01", "ap_planters2_01", - "ap_planters2_01", + "ap_radar1_01", "ap_seafences", "ap_seaplanfence1", - "ap_treesfw1_01", + "ap_stairsout02", + "ap_stairsout03", + "ap_stairsout04", + "ap_stairsout1", + "ap_subfraightback01", + "ap_subfraightback02", + "ap_subfraightback04", "ap_treesfw1_01", "ap_treeshot1_02", "ap_wallfence1", @@ -715,7 +753,6 @@ char *AlphaTestNames[] = { "ap_wallfence6", "ap_wallfence7", "b_hse_pierfence", - "b_hse_pierfence", "bank_palms02", "bank_palms09", "bank_palms21", @@ -726,58 +763,54 @@ char *AlphaTestNames[] = { "basketballcourt04", "basketballcourt05", "bb_fence1", - "bb_fence1", - "beach_bush02", "beach_bush02", "beach_bush04", - "beach_bush04", "beach_bush06s", - "beach_bush06s", - "beach_bush08s", "beach_bush08s", "biggrass2", - "BillBd04", - "BillBd1", - "BillBd2", - "BillBd3", "bldigste1mesh", + "boatcranelg0", + "build1", "buldingsite1", "carparkfence0", - "ci_busht_02", + "chandelier", + "ci_astagelights", + "ci_astudganwal", + "ci_boards1", + "ci_boards2", "ci_busht_02", "ci_busht_04", - "ci_busht_04", - "ci_busht_06", "ci_busht_06", "ci_busht_08", - "ci_busht_08", "ci_busht_11", - "ci_busht_11", - "ci_fence2", + "ci_dstudiogantry", "ci_fence2", "ci_mans1rail", "ci_mans1rail1", "ci_mans2rail1", "ci_planter1", - "ci_planter1", "ci_planter2", - "ci_planter2", - "ci_trees02", + "ci_pornsetxtra", + "ci_shipset", + "ci_stairsout01", "ci_trees02", "ci_trees03", - "ci_trees03", - "ci_trees04", "ci_trees04", "ci_trees05", - "ci_trees05", - "ci_trees1", "ci_trees1", "cl_curtains", + "cl_lightsuprts", "cl_railing", "cl_railingb", + "cl_recessedlights1", + "club_exterior01", + "club_exterior02", + "club_exterior06", + "club_exterior07", + "club_exterior08", + "club_exterior09", "compound_fence", - "compound_fence", - "concerth", + "concerth.col", "concerth02", "concerth03", "concerth04", @@ -800,6 +833,17 @@ char *AlphaTestNames[] = { "concerth56", "const_woodfence30", "cranebasea0", + "crgoshp010", + "crocneon", + "deco_polgrnda10", + "deco_polgrnda12", + "deco_polgrnda13", + "deco_polgrnda14", + "deco_polgrnda16", + "deco_polgrnda17", + "deco_polgrnda7", + "deco_polgrnda8", + "deco_polgrnda9", "dk_cargoshp01", "dk_cargoshp03", "dk_cargoshp04", @@ -833,6 +877,7 @@ char *AlphaTestNames[] = { "dk_rail01", "dk_rail02", "dk_rail03", + "dk_rail03", "dk_rail04", "dk_rail05", "dk_rail06", @@ -849,27 +894,24 @@ char *AlphaTestNames[] = { "dockcranescale0", "dockcranescale01", "dockfence", - "dockfence", "dockgate01", "dockgate02", "dockgrass", + "docks10", "docks10rail", + "docksware01", + "doontoon18", "doontoon25_alfas", "doontoon32_alfa", "doontoon66_bushes01", - "doontoon66_bushes01", + "doontoon76", "doublestreetlght1", "drive_flowers06", "dt_compound_alfas", "dt_scabby_fence01", - "dt_scabby_fence01", - "dt_scabby_fence03", "dt_scabby_fence03", "dt_scabby_fence04", - "dt_scabby_fence04", "dt_scabby_fence07", - "dt_scabby_fence07", - "dt_sheraton_fence", "dt_sheraton_fence", "dt_stadium__alfa1", "dtn_cablesa", @@ -879,10 +921,7 @@ char *AlphaTestNames[] = { "dtn_cablese", "dtn_cablesf", "dtn_hospital_fence", - "dtn_hospital_fence", "dtn_veg3", - "dtn_veg3", - "dtn_veg4", "dtn_veg4", "dts_telwire1", "dts_telwire2", @@ -890,77 +929,55 @@ char *AlphaTestNames[] = { "dts_telwire9", "dzplant", "fence01", - "fence01", - "fencehaiti", "fencehaiti", "fencehaitism", - "fencehaitism", - "fencesmallb", "fencesmallb", "gf_drdivide1_01", "gf_drivingrange1", "gf_golfwall", "gf_picket1_01", "gf_planters2", - "gf_planters2", - "gf_planters4", "gf_planters4", "gf_stadlight1_02", "gf_tennisfence", - "gf_tennisfence", - "gf_tree1_01", "gf_tree1_01", "gf_tree2_02", - "gf_tree2_02", - "gf_treesfw1_01", "gf_treesfw1_01", "gf_treesfw2_01", - "gf_treesfw2_01", - "gf_treesfw3_01", "gf_treesfw3_01", "gf_treesfw4_01", - "gf_treesfw4_01", - "gf_treesfw5_01", "gf_treesfw5_01", "grassbitsjm", "grasspatch", - "hoteltrees01", + "haitinwire11", + "haitinwire22", + "haitinwire23", + "havanahouse12b", "hoteltrees01", "hoteltrees02", - "hoteltrees02", - "hoteltrees03", "hoteltrees03", "hoteltrees05", - "hoteltrees05", - "hoteltrees06", "hoteltrees06", "ht_veg01_dy", - "ht_veg01_dy", - "ht_veg01_nt", "ht_veg01_nt", "ht_veg02_dy", - "ht_veg02_dy", - "ht_veg02_nt", "ht_veg02_nt", "ht_veg04_dy", - "ht_veg04_dy", - "ht_veg04_nt", "ht_veg04_nt", "kb_planter", + "kb_planter+bush", + "kb_planter+bush2", "kb_planterbox", - "kb_planterbox", - "kb_planterbush2", - "kb_planterbush2", "kb_planterbush2", "kickfence", "labiggrass", "labiggrass01", "labiggrass02", + "lh_haiblockc3", "lha_carfence", - "lha_carfence", - "lhavnew_bush", "lhavnew_bush", "lhbasket", + "lhbillboard05xx", "lhroofst01", "lhroofst02", "lhroofst03", @@ -991,37 +1008,30 @@ char *AlphaTestNames[] = { "lithavabit12", "littlehacoast02", "littlehacoast05", - "LODk_grassarea", - "LODmrgtrees4", - "LODrtrees1", - "LODrtrees2", - "LODrtrees3", - "LODrtrees4", - "LODrtrees5", - "LODse_pierfence", - "LODst_woodfence30", "lw_palm1", "mallbushdense", "mallbushs", "malltreereflect", "malltreereflect2", "malltrees01", - "man_build_int", - "man_build01_al", "man_build01", - "man_build02_al", + "man_build01_al", "man_build02", - "man_build03_al", + "man_build02_al", "man_build03", - "man_build04_fnce", + "man_build03_al", "man_build04", - "man_build05_al", + "man_build04_fnce", "man_build05", + "man_build05_al", + "man_build_int", "man_chandeliers", "man_f_chandelier", - "man_hall_ref", + "man_lights_pool", + "man_pool", "man_safenewmny", "man_scar_curtains", + "man_scar_props206", "man_sdr_folge", "man_sdr_rug", "man_twr_stairs", @@ -1029,19 +1039,12 @@ char *AlphaTestNames[] = { "man_xchandeliers", "mansbushes", "mansbushes2", - "Mansion2_C_fence", - "Mansion2_C_fence", - "mansionfence", + "mansion1b", "mansionfence", "marinafence01", - "marinafence01", - "marinafence02", "marinafence02", "marinafence03", - "marinafence03", "marinafence04", - "marinafence04", - "marinafence05", "marinafence05", "marinaplanter1", "marinaplanter2", @@ -1049,33 +1052,26 @@ char *AlphaTestNames[] = { "marinaveg2", "marinaveg3", "mc_fence1", - "mc_fence1", - "mc_fence2", "mc_fence2", "mc_fence3", - "mc_fence3", - "mc_treesfw1_01", + "mc_largebuild", + "mc_tower_01", + "mc_tower_02", + "mc_tower_03", "mc_treesfw1_01", "mc_treesfw2_01", - "mc_treesfw2_01", "mc_treesfw3_01", - "mc_treesfw3_01", - "ml_planterbed", + "mc_wall", + "mc_wall2", + "mc_wall3", "ml_planterbed", "ml_vegbits01", - "ml_vegbits01", - "ml_vegbits02", "ml_vegbits02", "ml_vegbits03", - "ml_vegbits03", "ml_vegbits04", - "ml_vegbits04", - "ml_vegbits05", "ml_vegbits05", "mlmallbush", "mn_treesis_int", - "mn_treesis_int", - "mn_treesisl05", "mn_treesisl05", "nbchflw01", "nbchflw02", @@ -1085,71 +1081,55 @@ char *AlphaTestNames[] = { "nbeachbed01", "nbeachbed02", "nbeachbit03rails", - "nbeachbit03rails", "nbeachvegy1", "nbeachvegy2", + "nbecland12", "nbecland12bball", + "nbecland12gates", "nbt_balcony02", "nbt_balcony03", "nbt_balcony05", "nbt_barfence01", - "nbt_hotel07fence", + "nbt_hotel06balcony", "nbt_hotel07fence", "nbt_hoteltrees01", - "nbt_hoteltrees01", - "nbt_hoteltrees02", "nbt_hoteltrees02", "nbt_mansion01", - "nbt_mansiontrees01", + "nbt_mansion02", + "nbt_mansion03", + "nbt_mansion04", + "nbt_mansion0402", "nbt_mansiontrees01", "nbt_mansiontrees02", - "nbt_mansiontrees02", - "nbt_mansiontrees03", "nbt_mansiontrees03", "nbt_mansiontrees04", - "nbt_mansiontrees04", - "nbt_mansiontrees05", "nbt_mansiontrees05", "nbt_rooftopstart", "nbthotel08fence02", - "nbthotel08fence02", "nbw_bush01", - "nbw_bush01", - "nbw_bush02", "nbw_bush02", "nbwbusshy2", "new_bushsm", - "new_bushsm", - "new_bushtest", "new_bushtest", "new_bushtest42", - "new_bushtest42", + "newbuild01", + "newbuild02", + "nhaitiplnt14", + "nhaitiplnt15", "nrth1veg21", "nrth1veg37", "nrth1veg42", "nrth3veg05", - "nrth3veg05", - "nrth3veg08", "nrth3veg08", "nrth3veg16", - "nrth3veg16", - "nrth3veg25", "nrth3veg25", "nrth3veg35", - "nrth3veg35", - "nrth3veg50", "nrth3veg50", "nrth3veg59", - "nrth3veg59", - "nrth4veg05", "nrth4veg05", "nrth4veg08", - "nrth4veg08", - "nrth4veg09", "nrth4veg09", "nrth4veg21", - "nrth4veg21", - "nrth4veg212", "nrth4veg212", "nrth7veg", "nrth7veg09", @@ -1159,39 +1139,51 @@ char *AlphaTestNames[] = { "nt_cablebox4_01", "nt_cablebox5_01", "nt_cablebox6_01", + "od_alleys1_01_dy", + "od_alleys1_01_nt", + "od_alleys1b_01_dy", + "od_alleys1b_01_nt", + "od_alleys2_01_dy", + "od_alleys2_01_nt", + "od_alleys3_01_dy", + "od_alleys3_01_nt", + "od_alleys3b_01_dy", + "od_alleys3b_01_nt", + "od_bighotsign01", "od_clevelfence", "od_clubfence_dy", "od_clubfence_nt", - "odnvegbush1", + "oddoorway", + "oddoorway2", + "oddoorwayS02", + "oddoorwayS1", "odnvegbush1", "odnvegbush2", - "odnvegbush2", - "odnvegbush2b", "odnvegbush2b", + "odnwiret", + "odrampbit", + "odrroofst02", + "odrroofst06", + "odrroofst07", "odrv_bushes", - "odrv_bushes", - "odrv_bushes01", "odrv_bushes01", "pierentrance02", "plants01", - "plants01", - "plants04", "plants04", "plants05", - "plants05", - "plants05b", "plants05b", "pw_backfence1", "pw_bayfence2_01", - "Rose_Bush01", - "Rose_Bush03", - "shpfrnts03rail01", + "rustship_structure0", + "scrapgate", + "sexgarden2", + "shipstairs", "shpfrnts03rail01", "shpfrnts03rail02", - "shpfrnts03rail02", + "sjmgrass", + "sjmgrass2", "spad_veg1", - "spad_veg1", - "starbitbush", + "starbbnet02", "starbitbush", "starbits05", "starbits06", @@ -1214,88 +1206,62 @@ char *AlphaTestNames[] = { "starbits57", "starbits58", "starbits59", + "starblocks04", "stardepot_FENCE", + "starfbed02", + "starfbed03", + "starfbed04", + "starfbed05", + "starfbed06", "starsbush2", "starwaterfrnt08", "stationfence", - "Streetlamp1", - "Streetlamp2", "stripinter", "stripinterupside", + "striplights", "svegrgedoor", "tall_fence", - "tall_fence", "telewire02", "telewire03", "telewire04", + "telgrphpole02", + "tesad06", + "tesad06sas", "tesad06ss", "veg_fern_balcny_kb1", - "veg_fern_balcny_kb1", - "veg_fern_balcny_kb2", "veg_fern_balcny_kb2", "veg_gaz", - "veg_gaz", - "veg_ivy_balcny_kb3", "veg_ivy_balcny_kb3", "veg_palm01", - "veg_palm01", - "veg_palm02", "veg_palm02", "veg_palm03", - "veg_palm03", - "veg_palm04", "veg_palm04", "veg_palmbig14", - "veg_palmbig14", - "veg_palmkb1", "veg_palmkb1", "veg_palmkb10", - "veg_palmkb10", - "veg_palmkb13", "veg_palmkb13", "veg_palmkb14", - "veg_palmkb14", - "veg_palmkb2", + "veg_palmkb1pERC", "veg_palmkb2", "veg_palmkb3", - "veg_palmkb3", - "veg_palmkb4", "veg_palmkb4", "veg_palmkb5", - "veg_palmkb5", - "veg_palmkb7", "veg_palmkb7", "veg_palmkb8", - "veg_palmkb8", - "veg_palmkb9", "veg_palmkb9", "veg_palmkbb11", - "veg_palmkbb11", - "veg_palwee01", "veg_palwee01", "veg_palwee02", - "veg_palwee02", - "veg_palwee03", "veg_palwee03", "veg_tree3", - "veg_tree3", - "veg_treea1", "veg_treea1", "veg_treea3", - "veg_treea3", - "veg_treeb1", "veg_treeb1", "veged", - "veged", - "veged01", "veged01", "veged02", - "veged02", - "vegeha1", "vegeha1", "vegetationb", - "vegetationb", - "vegetationb03", "vegetationb03", "washbuild003", "washbuild005", @@ -1361,15 +1327,12 @@ char *AlphaTestNames[] = { "washfence2", "washpshoutdet", "washpshoutveg", - "washpshoutveg", - "washskyplant1", "washskyplant1", "washskyplant2", - "washskyplant2", + "washundermall1", "washvegy2", "washvegy237", "washvegy238", - "washvegy238", "washvegy239", "washvegy240", "washvegy241", @@ -1379,9 +1342,10 @@ char *AlphaTestNames[] = { "washvegy4", "woshmallglas1", "woshmallglas2", + "wsgbuildwl97", + "wshbuildws42", "wshotelsign35", "wshotelveg1", - "wshotelveg1", "wshscarland226", "wshtelgrphcabl01", "wshtelgrphcabl02", @@ -1395,17 +1359,10 @@ char *AlphaTestNames[] = { "wshtelgrphcabl10", "wshtelgrphcabl11", "xpolytrees1_dt", - "xpolytrees1_dt", - "xpolytrees2_dt", "xpolytrees2_dt", "xpolytrees3_dt", - "xpolytrees3_dt", "xpolytrees4_dt", - "xpolytrees4_dt", - "odnwiret", - "odrroofst07", - "odrroofst06", - "odrroofst02", + "", };