30 files changed, 38 insertions, 42 deletions

diff --git a/autoexec.cfg b/autoexec.cfg
index 9800f58..bed8bbb 100755
--- a/autoexec.cfg
+++ b/autoexec.cfg
@@ -1,7 +1,7 @@
-// Example configuration file, my personal bindings - Xolatile.
+// Example configuration file, my personal bindings - xolatile.
 // This file will be executed every time the game is ran.
 
-exec custommapsmenu.cfg // Wide custom maps menu.
+name xolatile
 
 bind e      [setweapon 1] // Shotgun.
 bind q      [setweapon 2] // Chaingun.
diff --git a/data/blendbrush.cfg b/data/brushes.cfg
index 506193c..506193c 100644
--- a/data/blendbrush.cfg
+++ b/data/brushes.cfg
diff --git a/custommapsmenu.cfg b/data/custom_maps_menu.cfg
index cac660a..cac660a 100755
--- a/custommapsmenu.cfg
+++ b/data/custom_maps_menu.cfg
diff --git a/data/default_map.cfg b/data/default_map.cfg
new file mode 100644
index 0000000..50c7039
--- /dev/null
+++ b/data/default_map.cfg
@@ -0,0 +1,27 @@
+// Default settings for maps, executed each time the map is loaded.
+
+if (strcmp $skybox "") [
+    skybox "skyboxes/black"
+]
+
+materialreset
+
+texture water "materials/water.png"
+texture 1     "materials/waterfall.png"
+texture 1     "materials/water_n.png"
+texture 1     "materials/water_dudv.png"
+texture 1     "materials/waterfall_n.png"
+texture 1     "materials/waterfall_dudv.png"
+
+texture lava "materials/lava.png" 0 0 0 0.5
+texture 1    "materials/lava.png" 0 0 0 0.5
+
+texturereset
+
+    setshader "stdworld"
+        texture 0 "textures/sky.png"
+        texture 0 "textures/default.png"
+
+    exec "packages/textures/ex/package.cfg"
+
+    setshader "stdworld"
diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg
deleted file mode 100644
index 589f650..0000000
--- a/data/default_map_settings.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-// default settings for maps
-
-// on every map load, this file will be executed, followed by
-// "package.cfg" in the package dir of the map, and "<mapname>.cfg",
-// which you can use to override the settings in this file.
-
-// the skybox for this map:
-if (strcmp $skybox "") [
-    skybox "skyboxes/black"
-]
-
-materialreset
-texture water "textures/water2.png"    // water surface
-texture 1 "textures/waterfall.png"     // waterfall
-texture 1 "textures/watern.png"        // water normals
-texture 1 "textures/waterdudv.png"     // water distortion
-texture 1 "textures/waterfalln.png"    // waterfall normals
-texture 1 "textures/waterfalldudv.png" // waterfall distortion
-
-texture lava "textures/floor_lava2.png" 0 0 0 2 // lava surface
-texture 1 "textures/floor_lava2.png"    0 0 0 2 // falling lava
-
-// texture definitions for the map:
-texturereset    // starts the texture slot/index at 0
-    setshader stdworld   // use default world shader unless specified otherwise
-        texture 0 "textures/sky.png"     // dummy sky texture
-        texture 0 "textures/default.png" // default geometry texture
-
-    exec "packages/textures/ex/package.cfg"
-
-    // for cfgs that don't set shaders...
-    setshader stdworld
diff --git a/data/game_fps.cfg b/data/game.cfg
index 1720ccc..1720ccc 100644
--- a/data/game_fps.cfg
+++ b/data/game.cfg
diff --git a/packages/textures/floor_lava2.png b/packages/materials/lava.png
index e3904bb..e3904bb 100644
--- a/packages/textures/floor_lava2.png
+++ b/packages/materials/lava.png
diff --git a/packages/textures/water2.png b/packages/materials/water.png
index 872bc81..872bc81 100644
--- a/packages/textures/water2.png
+++ b/packages/materials/water.png
diff --git a/packages/textures/waterdudv.png b/packages/materials/water_dudv.png
index 725a2f6..725a2f6 100644
--- a/packages/textures/waterdudv.png
+++ b/packages/materials/water_dudv.png
diff --git a/packages/textures/watern.png b/packages/materials/water_n.png
index 0a44d9d..0a44d9d 100644
--- a/packages/textures/watern.png
+++ b/packages/materials/water_n.png
diff --git a/packages/textures/waterfall.png b/packages/materials/waterfall.png
index 54de3be..54de3be 100644
--- a/packages/textures/waterfall.png
+++ b/packages/materials/waterfall.png
diff --git a/packages/textures/waterfalldudv.png b/packages/materials/waterfall_dudv.png
index ee5f536..ee5f536 100644
--- a/packages/textures/waterfalldudv.png
+++ b/packages/materials/waterfall_dudv.png
diff --git a/packages/textures/waterfalln.png b/packages/materials/waterfall_n.png
index 5e23fce..5e23fce 100644
--- a/packages/textures/waterfalln.png
+++ b/packages/materials/waterfall_n.png
diff --git a/packages/textures/grass.png b/packages/textures/grass.png
deleted file mode 100644
index 845d352..0000000
--- a/packages/textures/grass.png
+++ /dev/null
diff --git a/packages/textures/grass_aard.png b/packages/textures/grass_aard.png
deleted file mode 100644
index 8f725ed..0000000
--- a/packages/textures/grass_aard.png
+++ /dev/null
diff --git a/packages/textures/grass_abbey.png b/packages/textures/grass_abbey.png
deleted file mode 100644
index b374a88..0000000
--- a/packages/textures/grass_abbey.png
+++ /dev/null
diff --git a/packages/textures/grass_dead.png b/packages/textures/grass_dead.png
deleted file mode 100644
index 588f78e..0000000
--- a/packages/textures/grass_dead.png
+++ /dev/null
diff --git a/packages/textures/grass_dg.png b/packages/textures/grass_dg.png
deleted file mode 100644
index 97815ea..0000000
--- a/packages/textures/grass_dg.png
+++ /dev/null
diff --git a/packages/textures/grass_ik.png b/packages/textures/grass_ik.png
deleted file mode 100644
index 6a3a16f..0000000
--- a/packages/textures/grass_ik.png
+++ /dev/null
diff --git a/packages/textures/grass_kurt.png b/packages/textures/grass_kurt.png
deleted file mode 100644
index 845d352..0000000
--- a/packages/textures/grass_kurt.png
+++ /dev/null
diff --git a/packages/textures/grass_kurt2.png b/packages/textures/grass_kurt2.png
deleted file mode 100644
index 5f9ad3f..0000000
--- a/packages/textures/grass_kurt2.png
+++ /dev/null
diff --git a/packages/textures/steep_fur_d.png b/packages/textures/steep_fur_d.png
deleted file mode 100644
index ba7aa22..0000000
--- a/packages/textures/steep_fur_d.png
+++ /dev/null
diff --git a/packages/textures/steep_fur_n.png b/packages/textures/steep_fur_n.png
deleted file mode 100644
index ac1429c..0000000
--- a/packages/textures/steep_fur_n.png
+++ /dev/null
diff --git a/packages/textures/steep_fur_z.png b/packages/textures/steep_fur_z.png
deleted file mode 100644
index dfedea4..0000000
--- a/packages/textures/steep_fur_z.png
+++ /dev/null
diff --git a/packages/textures/notexture.png b/packages/textures/texture_error.png
index 1d58fa2..1d58fa2 100644
--- a/packages/textures/notexture.png
+++ b/packages/textures/texture_error.png
diff --git a/packages/textures/water2_n.png b/packages/textures/water2_n.png
deleted file mode 100644
index 94169a9..0000000
--- a/packages/textures/water2_n.png
+++ /dev/null
diff --git a/src/engine/main.cpp b/src/engine/main.cpp
index b4a4c98..c7a88cf 100644
--- a/src/engine/main.cpp
+++ b/src/engine/main.cpp
@@ -1284,7 +1284,7 @@ int main(int argc, char **argv)
     logoutf("init: gl");
     gl_checkextensions();
     gl_init();
-    notexture = textureload("packages/textures/notexture.png");
+    notexture = textureload("packages/textures/texture_error.png");
     if(!notexture) fatal("could not find core textures");
 
     logoutf("init: console");
@@ -1309,8 +1309,9 @@ int main(int argc, char **argv)
     execfile("data/sounds.cfg");
     execfile("data/menus.cfg");
     execfile("data/heightmap.cfg");
-    execfile("data/blendbrush.cfg");
-    execfile("data/game_fps.cfg");
+    execfile("data/brushes.cfg");
+    execfile("data/game.cfg");
+    execfile("data/custom_maps_menu.cfg");
     if(game::savedservers()) execfile(game::savedservers(), false);
 
     identflags |= IDF_PERSIST;
diff --git a/src/engine/world.cpp b/src/engine/world.cpp
index 185d972..7f5baed 100644
--- a/src/engine/world.cpp
+++ b/src/engine/world.cpp
@@ -1268,7 +1268,7 @@ bool emptymap(int scale, bool force, const char *mname, bool usecfg)    // main
     if(usecfg)
     {
         identflags |= IDF_OVERRIDDEN;
-        execfile("data/default_map_settings.cfg", false);
+        execfile("data/default_map.cfg", false);
         identflags &= ~IDF_OVERRIDDEN;
     }
 
diff --git a/src/engine/world.h b/src/engine/world.h
index 9c5be78..9c8c502 100644
--- a/src/engine/world.h
+++ b/src/engine/world.h
@@ -20,7 +20,7 @@ struct octaheader
     int numvars;
     int numvslots;
 };
-    
+
 struct compatheader             // map file format header
 {
     char magic[4];              // "OCTA"
@@ -46,8 +46,8 @@ struct compatheader             // map file format header
 #define WATER_AMPLITUDE 0.4f
 #define WATER_OFFSET 1.1f
 
-enum 
-{ 
+enum
+{
     MATSURF_NOT_VISIBLE = 0,
     MATSURF_VISIBLE,
     MATSURF_EDIT_ONLY
diff --git a/src/engine/worldio.cpp b/src/engine/worldio.cpp
index 4a1d417..387678c 100644
--- a/src/engine/worldio.cpp
+++ b/src/engine/worldio.cpp
@@ -1246,7 +1246,7 @@ bool load_world(const char *mname, const char *cname)        // still supports a
     clearmainmenu();
 
     identflags |= IDF_OVERRIDDEN;
-    execfile("data/default_map_settings.cfg", false);
+    execfile("data/default_map.cfg", false);
     execfile(cfgname, false);
     identflags &= ~IDF_OVERRIDDEN;