Big changed mentioned in IRC channel...

1 files changed, 5 insertions, 108 deletions

diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg
index ab077dd..706ee0a 100644
--- a/data/default_map_settings.cfg
+++ b/data/default_map_settings.cfg
@@ -4,23 +4,21 @@
 // "package.cfg" in the package dir of the map, and "<mapname>.cfg",
 // which you can use to override the settings in this file.
 
-exec "data/default_map_models.cfg"
-
 // the skybox for this map:
 if (strcmp $skybox "") [
-    skybox "skyboxes/remus/sky01"
+    skybox "skyboxes/black"
 ]
 
 materialreset
-texture water "golgotha/water2.jpg"    // water surface
+texture water "textures/water2.jpg"    // water surface
 texture 1 "textures/waterfall.jpg"     // waterfall
 texture 1 "textures/watern.jpg"        // water normals
 texture 1 "textures/waterdudv.jpg"     // water distortion
 texture 1 "textures/waterfalln.jpg"    // waterfall normals
 texture 1 "textures/waterfalldudv.jpg" // waterfall distortion
 
-texture lava "dg/floor_lava2.jpg" 0 0 0 2 // lava surface
-texture 1 "dg/floor_lava2.jpg"    0 0 0 2 // falling lava
+texture lava "textures/floor_lava2.jpg" 0 0 0 2 // lava surface
+texture 1 "textures/floor_lava2.jpg"    0 0 0 2 // falling lava
 
 // texture definitions for the map:
 texturereset    // starts the texture slot/index at 0
@@ -28,108 +26,7 @@ texturereset    // starts the texture slot/index at 0
         texture 0 "textures/sky.png"     // dummy sky texture
         texture 0 "textures/default.png" // default geometry texture
 
-        texture 0 "aard/aardograss_1.jpg"
-            autograss "<agrad:0,0.2>textures/grass_aard.png"
-        texture 0 "ik2k/ik_floor_brick128a.jpg"
-        texture 0 "ik2k/ik_floor_wood128b.jpg"
-        texture 0 "ik2k/ik_ground_cobbles128.jpg"
-        texture 0 "ik2k/ik_brick_3216d.jpg"
-        texture 0 "ik2k/ik_brick_6464c.jpg"
-
-    exec "packages/dg/package.cfg"
-    exec "packages/tech1soc/package.cfg"
-    exec "packages/ik2k/package.cfg"
-    exec "packages/ikbase/package.cfg"
-    exec "packages/payne/package.cfg"
-    exec "packages/than_ind/package.cfg"
-    exec "packages/jf1/package.cfg"
-
-    // misc textures (mine/schwenz/some tech1soc)
-    setshader stdworld
-        texture 0 "aard/aardfdry256_1.jpg"
-        texture 0 "tech1soc/spring3.jpg"
-        texture 0 "tech1soc/sqrlig02wb.jpg"
-        texture 0 "tech1soc/sqrlig03bc.jpg"
-        texture 0 "tech1soc/zdetlig01bb.jpg"
-        texture 0 "tech1soc/zdetlig02bb.jpg"
-        texture 0 "aard/aardmbr16_2.jpg"
-        texture 0 "tech1soc/zdetlig04bb.jpg"
-        texture 0 "tech1soc/zdet_trim2a.jpg"
-        texture 0 "aard/aardmmet32_1.jpg"
-        texture 0 "tech1soc/zdet_trim5b.jpg"
-        texture 0 "schwenz/dt_tile_check.01.jpg"
-
-    exec "packages/egyptsoc/package.cfg"
-    exec "packages/rorschach/package2.cfg"
-    exec "packages/subverse/package.cfg"
-    exec "packages/g_pack/package.cfg"
-
-    // missing jf & tech1soc textures
-    setshader stdworld
-        texture 0 "jf1/jfsquare.jpg"
-        texture 0 "jf1/jfyellow.jpg"
-        texture 0 "tech1soc/jp11a.jpg"
-        texture 0 "tech1soc/flr_tmtl_drk.jpg"
-
-    exec "packages/lunaran/package.cfg"
-    exec "packages/gibbie/package.cfg"
-    exec "packages/philipk/package.cfg"
-    exec "packages/gor/package.cfg"
-    exec "packages/aftas/package.cfg"
-    exec "packages/mitaman/package.cfg"
-    exec "packages/noctua/package.cfg"
-    exec "packages/loopix/package.cfg"
-    exec "packages/g_pack/package2.cfg"
-
-    // Misc textures
-    setshader stdworld
-        texture 0 "textures/nieb/rock01.jpg"
-    setshader bumpspecmapworld
-    setshaderparam "specscale" 0.25 0.25 0.25
-        texture 0 "ikbase/specialbrick.jpg"
-        texture n "ikbase/specialbrick_normal.jpg"
-
-    exec "packages/painkillah/package.cfg"
-    exec "packages/tomek/package.cfg"
-    exec "packages/textures/nieb/package.cfg"
-    exec "packages/trak5/package.cfg"
-    exec "packages/textures/nieb/garden/package.cfg"
-    exec "packages/textures/medieval_soc/package.cfg"
-    exec "packages/textures/terrain_soc/package.cfg"
-    exec "packages/textures/nieb/autumn/package.cfg"
-    exec "packages/textures/nieb/clone/package.cfg"
-    exec "packages/textures/nieb/suite/package.cfg"
-
-    // Blikje bier
-    exec "packages/blikjebier/akaritori/package2.cfg"
-    exec "packages/blikjebier/concrete/package.cfg"
-    exec "packages/blikjebier/metal/package.cfg"
-
-    setshader stdworld
-        texture 0 "blikjebier/ground/ground1.jpg"
-        texture 0 "blikjebier/ground/ground2.jpg"
-        texture 0 "blikjebier/ground/ground3.jpg"
-        texture 0 "blikjebier/ground/ground4.jpg"
-        texture 0 "blikjebier/ground/ground5.jpg"
-        texture 0 "blikjebier/ground/g1mm.jpg"
-
-        texture 0 "blikjebier/snow/clear_snow.jpg"
-        texture 0 "blikjebier/snow/dirty_snow.jpg"
-
-    exec "packages/egyptsoc/package2.cfg"
-    exec "packages/textures/fatum/package.cfg"
-    exec "packages/textures/philipk/pk02/package.cfg"
-    exec "packages/textures/yves_allaire/ex/package.cfg"
-    exec "packages/dg/package2.cfg"
-
-    setshader stdworld
-        texture 0 "makke/dirt01.jpg"
-        texture 0 "makke/dirt02.jpg"
-        texture 0 "makke/platten.jpg"
-        texture 0 "makke/platten_var1.jpg"
-        texture 0 "textures/nieb/bonepile.jpg"
-
-    exec "packages/textures/swatllama/package.cfg"
+    exec "packages/textures/ex/package.cfg"
 
     // for cfgs that don't set shaders...
     setshader stdworld