diff --git a/packages/maps/official/ac_douze_tmp.cfg b/packages/maps/official/ac_douze_tmp.cfg deleted file mode 100644 index 2e7c34ed..00000000 --- a/packages/maps/official/ac_douze_tmp.cfg +++ /dev/null @@ -1,436 +0,0 @@ -fog 350 -fogcolour 0x968070 -mapmodelreset -mapmodel 2 2 0 0 "nothing" -mapmodel 4 1 0 0 "comp_bridge" -mapmodel 0 7 0 0 "ladder_7x" -mapmodel 0 8 0 0 "ladder_8x" -mapmodel 0 10 0 0 "ladder_10x" -mapmodel 0 11 0 0 "ladder_11x" -mapmodel 0 15 0 0 "ladder_15x" -mapmodel 0 12 0 0 "streetlamp" -mapmodel 0 12 0 0 "streetlamp" -mapmodel 3 2 0 0 "bench" -mapmodel 2 4 0 0 "dumpster" -mapmodel 0 0 0 0 "roadblock01" -mapmodel 0 0 0 0 "roadblock02" -mapmodel 1 8 0 0 "fence" -mapmodel 1 8 0 0 "fencepost" -mapmodel 0 0 0 0 "fencegate_open" -mapmodel 1 8 0 0 "fencegate_closed" -mapmodel 0 0 0 0 "grass01" -mapmodel 0 0 0 0 "grass01_d" -mapmodel 0 0 0 0 "grass01_s" -mapmodel 0 0 0 0 "grass02" -mapmodel 0 0 0 0 "grass02_d" -mapmodel 0 0 0 0 "grass02_s" -mapmodel 0 0 0 0 "plant01" -mapmodel 0 0 0 0 "plant01_d" -mapmodel 0 0 0 0 "plant01_s" -mapmodel 0 0 0 0 "tree01" -mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" -mapmodel 0 0 0 0 "picture1" -mapmodel 1 6 0 0 "locker" -mapmodel 0 0 0 0 "strahler" -mapmodel 0 0 0 0 "light01" -mapmodel 0 0 0 0 "bulb" -mapmodel 1 3 0 0 "barrel" -mapmodel 1 2 0 0 "barrel2" -mapmodel 0 0 0 0 "elektro" -mapmodel 3 1 0 0 "europalette" -mapmodel 0 0 0 0 "gastank" -mapmodel 2 1 0 0 "gutter_h" -mapmodel 1 2 0 0 "gutter_v" -mapmodel 0 0 0 0 "wrench" -mapmodel 0 0 0 0 "screw" -mapmodel 0 0 0 0 "signs/flammable" -mapmodel 0 0 0 0 "signs/speed" -mapmodel 0 0 0 0 "signs/maint" -mapmodel 0 0 0 0 "signs/caution" -mapmodel 0 0 0 0 "signs/biohazard" -mapmodel 0 0 0 0 "fag" -mapmodel 0 0 0 0 "can" -mapmodel 0 0 0 0 "can2" -mapmodel 0 0 0 0 "wood01" -mapmodel 0 0 0 0 "hook" -mapmodel 0 0 0 0 "coffeemug" -mapmodel 0 0 0 0 "flyer" -mapmodel 0 0 1 0 "poster" -mapmodel 1 1 0 0 "aard" -mapmodel 4 1 0 0 "bridge" -mapmodel 0 1 0 0 "ladder_rung" -mapmodel 0 8 0 0 "drainpipe" -mapmodel 2 2 0 0 "toca/airconditioner" -mapmodel 0 0 0 0 "toca/bullet" -mapmodel 0 1 0 0 "toca/cinderblock" -mapmodel 1 7 0 0 "toca/commrack" -mapmodel 1 4 0 0 "toca/commrack2" -mapmodel 0 0 0 0 "toca/computer/monkeymou" -mapmodel 1 8 0 0 "toca/corrugated/beam" -mapmodel 1 4 0 0 "toca/guardrail" -mapmodel 1 4 0 0 "toca/guardrail2" -mapmodel 0 0 0 0 "toca/milkcarton" -mapmodel 1 1 0 0 "toca/monitor" -mapmodel 2 3 0 0 "toca/officedesk" -mapmodel 0 0 0 0 "toca/plasmatv" -mapmodel 4 1 0 0 "toca/platformmet" -mapmodel 0 6 0 0 "toca/powermeter" -mapmodel 1 6 0 0 "toca/rack" -mapmodel 2 8 0 0 "toca/radarconsole" -mapmodel 0 0 0 0 "toca/securitycam/secucam" -mapmodel 0 0 0 0 "toca/sgshell" -mapmodel 4 1 7 0 "toca/stairs1" -mapmodel 4 1 0 0 "toca/stairs2" -mapmodel 1 3 0 0 "toca/radioactivedrum" -mapmodel 1 2 0 0 "toca/radioactivedrum2" -mapmodel 2 1 0 0 "toca/tyre" -mapmodel 1 2 0 0 "toca/trashbag" -mapmodel 1 3 0 0 "toca/trashcan" -mapmodel 1 2 0 0 "toca/tv" -mapmodel 2 3 0 0 "toca/utilitytable" -mapmodel 1 3 0 0 "toca/wheel" -mapmodel 0 0 0 0 "toca/signs/biohazard" -mapmodel 0 0 0 0 "toca/signs/chemical" -mapmodel 0 0 0 0 "toca/signs/confined" -mapmodel 0 0 0 0 "toca/signs/toxic" -mapmodel 0 0 0 0 "toca/signs/donotenter" -mapmodel 0 0 0 0 "toca/signs/explosives" -mapmodel 0 0 0 0 "toca/signs/firstaid" -mapmodel 0 0 0 0 "toca/signs/noentry" -mapmodel 0 0 0 0 "toca/signs/nosmoking" -mapmodel 0 0 0 0 "toca/signs/radioactive" -mapmodel 0 0 0 0 "toca/signs/restricted" -mapmodel 1 6 0 0 "toca/signs/target" -mapmodel 0 2 0 0 "toca/computer/pc" -mapmodel 1 8 0 0 "toca/corrugated/fence1" -mapmodel 1 8 0 0 "toca/corrugated/fence2" -mapmodel 0 0 0 0 "toca/securitycam/vertmount" -mapmodel 0 0 0 0 "toca/securitycam/wallmount" -mapmodel 1 4 0 0 "toca/guardrail2/gr2pole" -mapmodel 0 0 0 0 "toca/airconditioner/interior" -mapmodel 1 1 1 0 "toca/pipes/concretepipe" -mapmodel 1 1 1 0 "toca/pipes/metalpipe" -mapmodel 0 1 0 0 "toca/pipes/metalpipe2" -mapmodel 0 0 0 0 "signs/arab" -mapmodel 1 1 0 0 "toca/milkcrate" -mapmodel 0 0 0 0 "toca/ceilingfan" -mapmodel 1 7 0 0 "toca/tree1" -mapmodel 0 17 0 0 "toca/palmtree1" -mapmodel 2 3 0 0 "toca/razorwire" -mapmodel 0 14 0 0 "toca/tree2" -mapmodel 0 18 0 0 "toca/pine" -mapmodel 2 7 0 0 "toca/servercluster/rack" -mapmodel 2 1 0 0 "toca/servercluster/U3_1" -mapmodel 2 1 0 0 "toca/servercluster/U3_2" -mapmodel 2 1 0 0 "toca/servercluster/U3_3" -mapmodel 2 2 0 0 "toca/servercluster/U6_1" -mapmodel 2 2 0 0 "toca/servercluster/U6_2" -mapmodel 2 2 0 0 "toca/servercluster/U6_3" -mapmodel 0 4 0 0 "toca/window1" -mapmodel 1 2 8 0 "toca/barbwire" -mapmodel 1 1 0 0 "toca/shelf" -mapmodel 4 1 15 0 "toca/guardtower" -mapmodel 1 2 0 0 "toca/treetrunk1" -mapmodel 0 0 0 0 "nocamp" -loadsky "textures/skymaps/makke/mountain" -loadnotexture -texturereset -texture 0 "./kurt/klite1.jpg" -texture 0 "./toca/greybricks.jpg" -texture 0 "./arcitool/archibrick01.jpg" -texture 0 "./arcitool/archibrick02.jpg" -texture 0 "./arcitool/archibrick03.jpg" -texture 0 "./arcitool/archibrick04.jpg" -texture 0 "./arcitool/archibrick05.jpg" -texture 0 "./arcitool/archibrick06.jpg" -texture 0 "./arcitool/archibrick07.jpg" -texture 0 "./arcitool/rohbaubims.jpg" -texture 0 "./mitaman/grsites/brick051.jpg" -texture 0 "./mitaman/grsites/brick065.jpg" -texture 0 "./boeck/stone_022.jpg" -texture 0 "./DigitalFlux/gray_bricks_02.jpg" -texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" -texture 0 "./makke/bricks_3.jpg" -texture 0 "./makke/brickwall.jpg" -texture 0 "./noctua/wall/brick02.jpg" -texture 0 "./sub/brick_wall_08.jpg" -texture 0 "./sub/brick_wall_09.jpg" -texture 0 "./makke/bricky.jpg" -texture 0 "./makke/01-CMU.jpg" -texture 0 "./makke/mauer1.jpg" -texture 0 "./makke/mauer2.jpg" -texture 0 "./makke/d_brick.jpg" -texture 0 "./mitaman/3dcafe/stone18.jpg" -texture 0 "./noctua/tiles/16tile12.jpg" -texture 0 "./noctua/tiles/16tile09.jpg" -texture 0 "./noctua/tiles/16tile10.jpg" -texture 0 "./noctua/tiles/16tile11.jpg" -texture 0 "./noctua/tiles/16tile07.jpg" -texture 0 "./arcitool/Cotta1-grau.jpg" -texture 0 "./arcitool/Cotta1-graubraun.jpg" -texture 0 "./arcitool/Cotta1-graubraunhell.jpg" -texture 0 "./arcitool/Cotta1-hell.jpg" -texture 0 "./arcitool/Cotta2-beige.jpg" -texture 0 "./arcitool/Cotta2-dunkel.jpg" -texture 0 "./arcitool/Cotta2-grau.jpg" -texture 0 "./arcitool/Cotta2-satt.jpg" -texture 0 "./makke/tiles.jpg" -texture 0 "./noctua/ground/cobbles01.jpg" -texture 0 "./arcitool/pflaster2.jpg" -texture 0 "./arcitool/gittersteine2.jpg" -texture 0 "./makke/11-Brick.jpg" -texture 0 "./makke/stein.jpg" -texture 0 "./makke/br_tiles.jpg" -texture 0 "./makke/c_tile.jpg" -texture 0 "./makke/pebbles_01.jpg" -texture 0 "./arcitool/sisal21.jpg" -texture 0 "./makke/platten.jpg" -texture 0 "./noctua/ground/asph01.jpg" -texture 0 "./noctua/ground/asph02.jpg" -texture 0 "./noctua/ground/asph03.jpg" -texture 0 "./makke/asph_01.jpg" -texture 0 "./DigitalFlux/dirty_asphalt_02.jpg" -texture 0 "./DigitalFlux/dirty_asphalt_03.jpg" -texture 0 "./makke/concrete.jpg" -texture 0 "./makke/concrete_trim.jpg" -texture 0 "./makke/concrete_trim_small.jpg" -texture 0 "./noctua/ground/snowy03.jpg" -texture 0 "./noctua/ground/snowy04.jpg" -texture 0 "./noctua/ground/snowy05.jpg" -texture 0 "./noctua/metal/iron05.jpg" -texture 0 "./noctua/metal/iron05_b.jpg" -texture 0 "./noctua/metal/iron01.jpg" -texture 0 "./noctua/metal/zinc02.jpg" -texture 0 "./noctua/metal/zinc03.jpg" -texture 0 "./noctua/wall/plast02.jpg" -texture 0 "./noctua/wall/conc01.jpg" -texture 0 "./noctua/wall/conc02.jpg" -texture 0 "./noctua/wall/conc05.jpg" -texture 0 "./noctua/wall/wall02.jpg" -texture 0 "./arcitool/sichtbeton1.jpg" -texture 0 "./arcitool/sichtbeton2.jpg" -texture 0 "./noctua/ground/snowy02.jpg" -texture 0 "./boeck/stone_013.jpg" -texture 0 "./boeck/stone_014.jpg" -texture 0 "./noctua/wall/plast01.jpg" -texture 0 "./noctua/wall/plast03.jpg" -texture 0 "./noctua/wall/plast04.jpg" -texture 0 "./mitaman/various/5sqtunnelroad.jpg" -texture 0 "./mitaman/various/027metal.jpg" -texture 0 "./boeck/metal_019.jpg" -texture 0 "./boeck/metal_019_b.jpg" -texture 0 "./mitaman/various/036metal.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./mitaman/golgotha/hhroofgray.jpg" -texture 0 "./mitaman/golgotha/tunnel_ceiling.jpg" -texture 0 "./mitaman/golgotha/tunnel_ceiling_b.jpg" -texture 0 "./mitaman/zastrow/metal_overlaps.jpg" -texture 0 "./mitaman/zastrow/metal_plate_fill.jpg" -texture 0 "./mitaman/golgotha/metal_bumps2.jpg" -texture 0 "./mitaman/golgotha/metal_bumps3.jpg" -texture 0 "./mitaman/zastrow/metal_siding_kinks.jpg" -texture 0 "./noctua/metal/zinc01.jpg" -texture 0 "./noctua/metal/copper01.jpg" -texture 0 "./noctua/metal/copper02.jpg" -texture 0 "./noctua/metal/iron02.jpg" -texture 0 "./noctua/metal/iron03.jpg" -texture 0 "./noctua/metal/iron04.jpg" -texture 0 "./noctua/metal/metbgr01.jpg" -texture 0 "./noctua/metal/metbgr02.jpg" -texture 0 "./noctua/metal/metbgr03.jpg" -texture 0 "./noctua/metal/metbgr04.jpg" -texture 0 "./noctua/metal/verdig01.jpg" -texture 0 "./noctua/metal/brass01.jpg" -texture 0 "./mitaman/various/006metal.jpg" -texture 0 "./mitaman/various/metal020.jpg" -texture 0 "./boeck/wood_009.jpg" -texture 0 "./boeck/wood_010.jpg" -texture 0 "./boeck/wood_017.jpg" -texture 0 "./makke/wood_01.jpg" -texture 0 "./makke/wood_01_b.jpg" -texture 0 "./arcitool/n_f-natur2.jpg" -texture 0 "./arcitool/Blockbohlen-natur.jpg" -texture 0 "./arcitool/Zaun.jpg" -texture 0 "./arcitool/Rundholz.jpg" -texture 0 "./mitaman/grsites/wood060.jpg" -texture 0 "./noctua/wood/blinds01.jpg" -texture 0 "./noctua/wood/fb_board.jpg" -texture 0 "./noctua/wood/planks01.jpg" -texture 0 "./noctua/wood/planks01_b.jpg" -texture 0 "./noctua/wood/planks02.jpg" -texture 0 "./noctua/wood/planks02_hor.jpg" -texture 0 "./noctua/wood/planks02_trim.jpg" -texture 0 "./noctua/wood/bark01.jpg" -texture 0 "./noctua/wood/wood02.jpg" -texture 0 "./noctua/wood/wood03.jpg" -texture 0 "./noctua/wood/wood04.jpg" -texture 0 "./mitaman/various/063bois.jpg" -texture 0 "./mitaman/various/063bois_b.jpg" -texture 0 "./craig_fortune/terrain/grass_lush1.jpg" -texture 0 "./craig_fortune/terrain/Grass_mossy.jpg" -texture 0 "./craig_fortune/terrain/Grass_parched.jpg" -texture 0 "./arcitool/Wiese3.jpg" -texture 0 "./arcitool/Wiese6.jpg" -texture 0 "./craig_fortune/terrain/Grass_lush.jpg" -texture 0 "./craig_fortune/terrain/mud.jpg" -texture 0 "./craig_fortune/terrain/Mud_thick.jpg" -texture 0 "./makke/cracked_mud.jpg" -texture 0 "./craig_fortune/terrain/sand_bleached.jpg" -texture 0 "./sub/sub_sand.jpg" -texture 0 "./DigitalFlux/light_brown_dirt_02.jpg" -texture 0 "./DigitalFlux/dirt_pebbles_01.jpg" -texture 0 "./DigitalFlux/light_brown_dirt_01.jpg" -texture 0 "./DigitalFlux/reddish_brown_dirt_01.jpg" -texture 0 "./DigitalFlux/reddish_brown_dirt_02.jpg" -texture 0 "./makke/dirt_01.jpg" -texture 0 "./makke/stuck1.jpg" -texture 0 "./noctua/ground/mud01.jpg" -texture 0 "./noctua/ground/pebble01.jpg" -texture 0 "./noctua/ground/ground02.jpg" -texture 0 "./noctua/ground/ground06.jpg" -texture 0 "./arcitool/schotter1.jpg" -texture 0 "./arcitool/schotter2.jpg" -texture 0 "./craig_fortune/terrain/Rock_cracked.jpg" -texture 0 "./craig_fortune/terrain/rubble.jpg" -texture 0 "./craig_fortune/terrain/Rock_rubble.jpg" -texture 0 "./noctua/ground/snowy01.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/stone/stone18.jpg" -texture 0 "./noctua/stone/stone02.jpg" -texture 0 "./noctua/stone/stone03.jpg" -texture 0 "./noctua/stone/stone04.jpg" -texture 0 "./noctua/stone/stone05.jpg" -texture 0 "./noctua/stone/stone06.jpg" -texture 0 "./noctua/stone/stone07.jpg" -texture 0 "./noctua/stone/stone08.jpg" -texture 0 "./noctua/stone/stone09.jpg" -texture 0 "./noctua/stone/stone12.jpg" -texture 0 "./noctua/stone/stone13.jpg" -texture 0 "./noctua/stone/stone15.jpg" -texture 0 "./noctua/stone/stone16.jpg" -texture 0 "./noctua/stone/stone17.jpg" -texture 0 "./noctua/stone/marmor01.jpg" -texture 0 "./noctua/stone/stone19.jpg" -texture 0 "./noctua/wall/conc03.jpg" -texture 0 "./noctua/wall/conc04.jpg" -texture 0 "./noctua/wall/d_wall01.jpg" -texture 0 "./noctua/textile/carpet04.jpg" -texture 0 "./noctua/textile/carpet01.jpg" -texture 0 "./noctua/textile/carpet02.jpg" -texture 0 "./noctua/textile/carpet03.jpg" -texture 0 "./noctua/textile/burlap01.jpg" -texture 0 "./noctua/textile/carpet05.jpg" -texture 0 "./arcitool/Wellblech1-1.jpg" -texture 0 "./arcitool/Glasbausteine.jpg" -texture 0 "./boeck/gully.jpg" -texture 0 "./boeck/aircon2.jpg" -texture 0 "./makke/aircon.jpg" -texture 0 "./makke/aircon_sm.jpg" -texture 0 "./makke/door.jpg" -texture 0 "./makke/klappe.jpg" -texture 0 "./makke/klappe2.jpg" -texture 0 "./makke/klappe3.jpg" -texture 0 "./makke/neuklappe.jpg" -texture 0 "./makke/panel.jpg" -texture 0 "./mitaman/3dcafe/objects09_a.jpg" -texture 0 "./mitaman/golgotha/elecpanelstwo.jpg" -texture 0 "./mitaman/various/metal_trim_4_v.jpg" -texture 0 "./mitaman/various/metal_trim_4_h.jpg" -texture 0 "./mitaman/various/metal026.jpg" -texture 0 "./mitaman/various/vent_cap.jpg" -texture 0 "./mitaman/various/rgrates0006.jpg" -texture 0 "./mitaman/various/large_plate.jpg" -texture 0 "./makke/lampe.jpg" -texture 0 "./makke/lampe_tile.jpg" -texture 0 "./makke/lampe_tile_a.jpg" -texture 0 "./makke/lampe_tile2.jpg" -texture 0 "./makke/lampe_tile2_a.jpg" -texture 0 "./makke/stairtrim.jpg" -texture 0 "./makke/metalstair1.jpg" -texture 0 "./makke/metalstair2.jpg" -texture 0 "./mitaman/zastrow/metal_siding_kinksb.jpg" -texture 0 "./makke/window.jpg" -texture 0 "./makke/windows.jpg" -texture 0 "./mitaman/zastrow/sub_window31.jpg" -texture 0 "./mitaman/zastrow/sub_window33.jpg" -texture 0 "./mitaman/various/sub_window23.jpg" -texture 0 "./mitaman/various/sub_window38.jpg" -texture 0 "./mitaman/3dcafe/door10.jpg" -texture 0 "./mitaman/3dcafe/door12.jpg" -texture 0 "./mitaman/3dcafe/door15.jpg" -texture 0 "./mitaman/3dcafe/door07.jpg" -texture 0 "./mitaman/zastrow/sub_doors512B05.jpg" -texture 0 "./mitaman/zastrow/sub_doors512A10.jpg" -texture 0 "./mitaman/zastrow/sub_doors512A16.jpg" -texture 0 "./mitaman/various/sub_doors256nf_01.jpg" -texture 0 "./mitaman/3dcafe/objects08.jpg" -texture 0 "./craig_fortune/crates/light_weathered.jpg" -texture 0 "./craig_fortune/crates/light.jpg" -texture 0 "./zastrow/3wood_crate_03.jpg" -texture 0 "./zastrow/2wood_crate_03.jpg" -texture 0 "./zastrow/2wood_crate_10.jpg" -texture 0 "./zastrow/2wood_crate_12.jpg" -texture 0 "./zastrow/3wood_crate_02.jpg" -texture 0 "./zastrow/2wood_crate_02.jpg" -texture 0 "./zastrow/3wood_crate_10.jpg" -texture 0 "./zastrow/3wood_crate_12.jpg" -texture 0 "./zastrow/wood_crate_02.jpg" -texture 0 "./zastrow/wood_crate_03.jpg" -texture 0 "./zastrow/wood_crate_10.jpg" -texture 0 "./zastrow/wood_crate_12.jpg" -texture 0 "./makke/box_2.jpg" -texture 0 "./makke/box_4.jpg" -texture 0 "./makke/box_3.jpg" -texture 0 "./makke/smallsteelbox.jpg" -texture 0 "./drunkenM/rock_wall1.jpg" -texture 0 "./makke/douze.jpg" -texture 0 "./makke/clayceiling.jpg" -mapsoundreset -mapsound "./ambience/cavedrip.ogg" -1 -mapsound "./ambience/distant_cars.ogg" -1 -mapsound "./ambience/hum01.ogg" -1 -mapsound "./ambience/hum02.ogg" -1 -mapsound "./ambience/night_crickets.ogg" -1 -mapsound "./ambience/water.ogg" -1 -mapsound "./ambience/wind.ogg" -1 -mapsound "./ambience/t_aircond.ogg" -1 -mapsound "./ambience/t_compressor.ogg" -1 -mapsound "./ambience/t_crow.ogg" -1 -mapsound "./ambience/t_dogs01.ogg" -1 -mapsound "./ambience/t_helicopter.ogg" -1 -mapsound "./ambience/t_hum01.ogg" -1 -mapsound "./ambience/t_hum02.ogg" -1 -mapsound "./ambience/t_hum03.ogg" -1 -mapsound "./ambience/t_hum04.ogg" -1 -mapsound "./ambience/t_night_dog.ogg" -1 -mapsound "./ambience/t_night01.ogg" -1 -mapsound "./ambience/t_night02.ogg" -1 -mapsound "./ambience/t_radio_comms.ogg" -1 -mapsound "./ambience/t_radio_static.ogg" -1 -mapsound "./ambience/t_satcoms.ogg" -1 -mapsound "./ambience/t_sludge.ogg" -1 -mapsound "./ambience/t_static01.ogg" -1 -mapsound "./ambience/t_static02.ogg" -1 -mapsound "./ambience/t_vent01.ogg" -1 -mapsound "./ambience/t_vent02.ogg" -1 -mapsound "./ambience/t_water_owl.ogg" -1 -mapsound "./ambience/t_water01.ogg" -1 -mapsound "./ambience/t_waterdrip.ogg" -1 -mapsound "./ambience/t_wind.ogg" -1 -mapsound "./ambience/t_waterpipe01.ogg" -1 -mapsound "./ambience/t_waterpipe02.ogg" -1 -mapsound "./ambience/warningalarm01.ogg" -1 -mapsound "./ambience/t_gastank.ogg" -1 -mapsound "./ambience/t_keyboard.ogg" 1 -mapsound "./ambience/t_factory01.ogg" -1 -mapsound "./ambience/t_vents.ogg" -1 -mapsound "./ambience/t_waterfront.ogg" -1 -mapsound "./ambience/t_generator.ogg" -1 -mapsound "./ambience/t_electricbuzz.ogg" -1 -mapsound "./ambience/t_alarm01.ogg" -1 -mapsound "./ambience/flies.ogg" -1 -mapsound "./ambience/deserthawk.ogg" -1 -mapsound "./ambience/owl.ogg" -1 -mapsound "./ambience/citynoisebirds.ogg" -1 diff --git a/packages/maps/official/ac_douze_tmp.cgz b/packages/maps/official/ac_douze_tmp.cgz deleted file mode 100644 index 8c9850ff..00000000 Binary files a/packages/maps/official/ac_douze_tmp.cgz and /dev/null differ diff --git a/packages/misc/items.png b/packages/misc/items.png index 31c2418f..6ce65d13 100644 Binary files a/packages/misc/items.png and b/packages/misc/items.png differ diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index efebf2b5..22e2adc7 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -10,7 +10,7 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t void drawequipicon(float x, float y, int col, int row, float blend) { static Texture *tex = NULL; - if(!tex) tex = textureload("packages/misc/items-tmp.png", 4); + if(!tex) tex = textureload("packages/misc/items.png", 4); if(tex) { if(blend) glEnable(GL_BLEND); @@ -268,7 +268,7 @@ void drawequipicons(playerent *p) glColor4f(1.0f, 1.0f, 1.0f, 0.2f+(sinf(lastmillis/100.0f)+1.0f)/2.0f); // health & armor - if(p->armour) drawequipicon(620, 1650, 3, 3, false); + if(p->armour) drawequipicon(620, 1650, (p->armour-1)/25, 2, false); drawequipicon(20, 1650, 2, 3, (p->state!=CS_DEAD && p->health<=20 && !m_osok)); // weapons diff --git a/source/src/server.cpp b/source/src/server.cpp index aeb931d2..bd09e947 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1625,7 +1625,7 @@ void startdemoplayback(const char *newname) setupdemoplayback(); } -int Mvolume, Marea, Mopen; +int Mvolume, Marea, Mopen = 0; float Mheight = 0; void startgame(const char *newname, int newmode, int newtime, bool notify) @@ -1673,7 +1673,7 @@ void startgame(const char *newname, int newmode, int newtime, bool notify) if(e.fitsmode(smode)) sents[i].spawned = sents[i].legalpickup = true; } mapbuffer.setrevision(); - logline(ACLOG_INFO, "Map height density information for %s: H = %.2f V = %d and A = %d", smapname, Mheight, Mvolume, Marea); + logline(ACLOG_INFO, "Map height density information for %s: H = %.2f V = %d, A = %d and MA = %d", smapname, Mheight, Mvolume, Marea, Mopen); } else if(isdedicated) sendservmsg("\f3server error: map not found - please start another map"); if(notify) @@ -2102,6 +2102,7 @@ void checkclientpos(client *cl) { vec &po = cl->state.o; int ls = (1 << maplayout_factor) - 1; + if(po.x < 0 || po.y < 0 || po.x > ls || po.y > ls || maplayout[((int) po.x) + (((int) po.y) << maplayout_factor)] > po.z + 3) { if(gamemillis > 10000 && (servmillis - cl->connectmillis) > 10000) cl->mapcollisions++; diff --git a/source/src/serveractions.h b/source/src/serveractions.h index 785fdd8c..6b9a4460 100644 --- a/source/src/serveractions.h +++ b/source/src/serveractions.h @@ -49,7 +49,7 @@ struct mapaction : serveraction bool notify = valid_client(caller); int maploc = MAP_NOTFOUND; mapstats *ms = map[0] ? getservermapstats(map, true, &maploc) : NULL; // this is very redundant, since startgame gets the layout - mapok = mode == GMODE_COOPEDIT || ( ms != NULL && Mheight < 30 ); + mapok = mode == GMODE_COOPEDIT || ( ms != NULL && Mheight < 30 && (Mopen = checkarea()) < 10000 ); if(!mapok) { if(notify) sendservmsg("the server does not have/support this map", caller); diff --git a/source/src/serverchecks.h b/source/src/serverchecks.h index 7af87765..da7c4a66 100644 --- a/source/src/serverchecks.h +++ b/source/src/serverchecks.h @@ -1,7 +1,86 @@ -int checkarea(char *maplayout) +#define MINELINE 50 + +int getmaxarea(bool inversed_x, bool inversed_y, bool transposed) { - return 0; + int ls = (1 << maplayout_factor); + int xi = 0, oxi = 0, xf = 0, oxf = 0, yi = 0, yf = 0, fx = 0, fy = 0; + int area = 0, maxarea = 0; + bool sav_x = false, sav_y = false; + + if (transposed) fx = maplayout_factor; + else fy = maplayout_factor; + + // walk on x for each y + for ( int y = (inversed_y ? ls-1 : 0); (inversed_y ? y >= 0 : y < ls); (inversed_y ? y-- : y++) ) { + + /* Analyzing each cube of the line */ + for ( int x = (inversed_x ? ls-1 : 0); (inversed_x ? x >= 0 : x < ls); (inversed_x ? x-- : x++) ) { + if ( maplayout[ ( x << fx ) + ( y << fy ) ] != 127 ) { // if it is not solid + if ( sav_x ) { // if the last cube was saved + xf = x; // new end for this line + } + else { + xi = x; // new begin of the line + sav_x = true; // accumulating cubes from now + } + } else { // solid + if ( xf - xi > MINELINE ) break; // if the empty line is greater than a minimum, get out + sav_x = false; // stop the accumulation of cubes + } + } + + /* Analyzing this line with the previous one */ + if ( xf - xi > MINELINE ) { // if the line has the minimun threshold of emptiness + if ( sav_y ) { // if the last line was saved + if ( 2*oxi + MINELINE < 2*xf && + 2*xi + MINELINE < 2*oxf ) { // if the last line intersect this one + yf = y; // new end of area + area += xf - xi; + } else { + oxi = xi; // new area vertices + oxf = xf; + } + } + else { + oxi = xi; + oxf = xf; + yi = y; // new begin of area + sav_y = true; // accumulating lines from now + } + } else { + sav_y = false; // stop the accumulation of lines + if (area > maxarea) maxarea = area; // new max area + area=0; + } + + sav_x = false; // reset + xi = xf = 0; + } + return maxarea; +} + +/* Please... someone more skilled do a better job here... this is ridiculous */ +int checkarea() { + int area = 0, maxarea = 0; + area = getmaxarea(false,false,false); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(true,false,false); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(false,true,false); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(true,true,false); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(false,false,true); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(true,false,true); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(false,true,true); + if ( area > maxarea ) maxarea = area; + area = getmaxarea(true,true,true); + if ( area > maxarea ) maxarea = area; + + return maxarea; } /** @@ -16,7 +95,7 @@ one coding this kind of check must pay a special attention to the lag effect and affect the data observed. This is not a trivial task, and probably it is the main reason why such tools were never implemented. -This file is here for compatibility purposes. +This part is here for compatibility purposes. If you know nothing about these detections, please, just ignore it. */ diff --git a/source/src/tools.cpp b/source/src/tools.cpp index 4ba1135f..8c2b475b 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -25,9 +25,9 @@ const char *numtime() } extern char *maplayout; -extern int maplayout_factor, Mvolume, Marea, Mopen; +extern int maplayout_factor, Mvolume, Marea; extern float Mheight; -extern int checkarea(char *maplayout); +extern int checkarea(); mapstats *loadmapstats(const char *filename, bool getlayout) { @@ -83,8 +83,8 @@ mapstats *loadmapstats(const char *filename, bool getlayout) memset(maplayout, 0, layoutsize * sizeof(char)); char *t = NULL; char floor = 0, ceil; - int diff; - Mvolume = Marea = Mopen = 0; + int diff = 0; + Mvolume = Marea = 0; loopk(layoutsize) { char *c = maplayout + k; @@ -110,10 +110,6 @@ mapstats *loadmapstats(const char *filename, bool getlayout) ceil = f->getchar(); if(floor >= ceil && ceil > -128) floor = ceil - 1; // for pre 12_13 diff = ceil - floor; - if ( diff > 6 ) { - Marea++; - Mvolume+=diff; - } if(type == FHF) floor = -128; f->getchar(); f->getchar(); if(s.hdr.version>=2) f->getchar(); @@ -125,14 +121,15 @@ mapstats *loadmapstats(const char *filename, bool getlayout) if(s.hdr.version<=2) { f->getchar(); f->getchar(); } break; } + if ( type != SOLID && diff > 6 ) { + Marea++; + Mvolume+=diff; + } if(fail) break; t = c; } if(fail) { DELETEA(maplayout); } - else { - Mheight = Marea ? (float)Mvolume/Marea : 0; - Mopen = checkarea(maplayout); - } + else Mheight = Marea ? (float)Mvolume/Marea : 0; } } delete f;