4 files changed, 9 insertions, 8 deletions
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;