Removed steep fur, changed script names, grass textures...

diff --git a/autoexec.cfg b/autoexec.cfg
index 9800f582d1a164701e8d22ad5424dad070b9d16c..bed8bbb145674b056f74f7a2d7c5898ded7cee6f 100755 (executable)
--- 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/custommapsmenu.cfg b/custommapsmenu.cfg
deleted file mode 100755 (executable)
index cac660a..0000000
--- a/custommapsmenu.cfg
+++ /dev/null
@@ -1,71 +0,0 @@
-// Custom map menu, ported from Sauerbraten, 7Year aka Xolatile.
-
-octabase = "^f7"
-octamain = "^f1"
-unmapsx  = 4
-unmapsy  = 24
-
-custommaps = ""
-
-loopfiles curmap "packages/maps" "ogz" [
-       if (< (indexof $allmaps $curmap) 0) [
-               custommaps = (concat $custommaps $curmap)
-       ]
-]
-
-sy_nume = (listlen $custommaps)
-
-showcustommaps = [sy_remaps; showgui sy_unmaps]
-
-sy_remaps = [
-       custommaps = ""
-       loopfiles curmap "packages/maps" "ogz" [
-               if (< (indexof $allmaps $curmap) 0) [
-                       custommaps = (concat $custommaps $curmap)
-               ]
-       ]
-       custommaps = (sortlist $custommaps x y [<=s $x $y])
-       amountxy = (+ (div (listlen $custommaps) $unmapsy) 1)
-       loop syxy $amountxy [
-               (concatword "custommaps" $syxy) = ""
-       ]; syxy = 0
-       loop syxy $amountxy [
-               (concatword "custommaps" $syxy)
-               loop unto $unmapsy [
-                       (concatword "custommaps" $syxy) = (concat $(concatword "custommaps" $syxy) (at $custommaps (+ (* $unmapsy $syxy) $unto)))
-               ]
-       ]; syxy = 0; unto = 0
-       sy_nume = (listlen $custommaps)
-]
-
-newgui sy_unmaps [
-       if (mod $amountxy $unmapsx) [
-               sy_unpage = (+ (div $amountxy $unmapsx) 1)
-       ] [
-               sy_unpage = (div $amountxy $unmapsx)
-       ]
-       loop syi $sy_unpage [
-               guilist [
-                       loop syj $unmapsx [
-                               if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
-                                       guistrut $unmapsy 1
-                                       guilist [
-                                               guistrut 27 1
-                                               looplist unto $(concatword "custommaps" (+ (* $syi $unmapsx) $syj )) [
-                                                       guibutton (concatword $octabase $unto) (concat map $unto) "cube"
-                                               ]
-                                       ]
-                               ]
-                       ]
-                       guibar
-                       if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
-                               guiimage (concatword "packages/maps/" (strreplace $guirolloveraction "map " "") ".jpg") $guirolloveraction 6 1 "data/cube.png"
-                       ]
-               ]
-               if (= (+ $syi 1) $sy_unpage) [
-
-               ] [
-                       guitab (concatword $octamain (+ $syi 2))
-               ]
-       ]
-] (concatword $octamain "Custom Maps (" $sy_nume ")")

diff --git a/data/blendbrush.cfg b/data/blendbrush.cfg
deleted file mode 100644 (file)
index 506193c..0000000
--- a/data/blendbrush.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-//////////////////////////////////////////////////////////////////
-//Texture blending
-
-addblendbrush "Circle 8px soft" "packages/blendbrush/circle_8_soft.png"
-addblendbrush "Circle 8px hard" "packages/blendbrush/circle_8_hard.png"
-addblendbrush "Circle 8px solid" "packages/blendbrush/circle_8_solid.png"
-addblendbrush "Circle 16px soft" "packages/blendbrush/circle_16_soft.png"
-addblendbrush "Circle 16px hard" "packages/blendbrush/circle_16_hard.png"
-addblendbrush "Circle 16px solid" "packages/blendbrush/circle_16_solid.png"
-addblendbrush "Circle 32px soft" "packages/blendbrush/circle_32_soft.png"
-addblendbrush "Circle 32px hard" "packages/blendbrush/circle_32_hard.png"
-addblendbrush "Circle 32px solid" "packages/blendbrush/circle_32_solid.png"
-addblendbrush "Circle 64px soft" "packages/blendbrush/circle_64_soft.png"
-addblendbrush "Circle 64px hard" "packages/blendbrush/circle_64_hard.png"
-addblendbrush "Circle 64px solid" "packages/blendbrush/circle_64_solid.png"
-addblendbrush "Circle 128px soft" "packages/blendbrush/circle_128_soft.png"
-addblendbrush "Circle 128px hard" "packages/blendbrush/circle_128_hard.png"
-addblendbrush "Circle 128px solid" "packages/blendbrush/circle_128_solid.png"
-addblendbrush "Noise 64px" "packages/blendbrush/noise_64.png"
-addblendbrush "Noise 128px" "packages/blendbrush/noise_128.png"
-addblendbrush "Square 16px hard" "packages/blendbrush/square_16_hard.png"
-addblendbrush "Square 16px solid" "packages/blendbrush/square_16_solid.png"
-addblendbrush "Square 32px hard" "packages/blendbrush/square_32_hard.png"
-addblendbrush "Square 32px solid" "packages/blendbrush/square_32_solid.png"
-addblendbrush "Square 64px hard" "packages/blendbrush/square_64_hard.png"
-addblendbrush "Square 64px solid" "packages/blendbrush/square_64_solid.png"
-addblendbrush "Gradient 16px" "packages/blendbrush/gradient_16.png"
-addblendbrush "Gradient 32px" "packages/blendbrush/gradient_32.png"
-addblendbrush "Gradient 64px" "packages/blendbrush/gradient_64.png"
-addblendbrush "Gradient 128px" "packages/blendbrush/gradient_128.png"
-

diff --git a/data/brushes.cfg b/data/brushes.cfg
new file mode 100644 (file)
index 0000000..506193c
--- /dev/null
+++ b/data/brushes.cfg
@@ -0,0 +1,31 @@
+//////////////////////////////////////////////////////////////////
+//Texture blending
+
+addblendbrush "Circle 8px soft" "packages/blendbrush/circle_8_soft.png"
+addblendbrush "Circle 8px hard" "packages/blendbrush/circle_8_hard.png"
+addblendbrush "Circle 8px solid" "packages/blendbrush/circle_8_solid.png"
+addblendbrush "Circle 16px soft" "packages/blendbrush/circle_16_soft.png"
+addblendbrush "Circle 16px hard" "packages/blendbrush/circle_16_hard.png"
+addblendbrush "Circle 16px solid" "packages/blendbrush/circle_16_solid.png"
+addblendbrush "Circle 32px soft" "packages/blendbrush/circle_32_soft.png"
+addblendbrush "Circle 32px hard" "packages/blendbrush/circle_32_hard.png"
+addblendbrush "Circle 32px solid" "packages/blendbrush/circle_32_solid.png"
+addblendbrush "Circle 64px soft" "packages/blendbrush/circle_64_soft.png"
+addblendbrush "Circle 64px hard" "packages/blendbrush/circle_64_hard.png"
+addblendbrush "Circle 64px solid" "packages/blendbrush/circle_64_solid.png"
+addblendbrush "Circle 128px soft" "packages/blendbrush/circle_128_soft.png"
+addblendbrush "Circle 128px hard" "packages/blendbrush/circle_128_hard.png"
+addblendbrush "Circle 128px solid" "packages/blendbrush/circle_128_solid.png"
+addblendbrush "Noise 64px" "packages/blendbrush/noise_64.png"
+addblendbrush "Noise 128px" "packages/blendbrush/noise_128.png"
+addblendbrush "Square 16px hard" "packages/blendbrush/square_16_hard.png"
+addblendbrush "Square 16px solid" "packages/blendbrush/square_16_solid.png"
+addblendbrush "Square 32px hard" "packages/blendbrush/square_32_hard.png"
+addblendbrush "Square 32px solid" "packages/blendbrush/square_32_solid.png"
+addblendbrush "Square 64px hard" "packages/blendbrush/square_64_hard.png"
+addblendbrush "Square 64px solid" "packages/blendbrush/square_64_solid.png"
+addblendbrush "Gradient 16px" "packages/blendbrush/gradient_16.png"
+addblendbrush "Gradient 32px" "packages/blendbrush/gradient_32.png"
+addblendbrush "Gradient 64px" "packages/blendbrush/gradient_64.png"
+addblendbrush "Gradient 128px" "packages/blendbrush/gradient_128.png"
+

diff --git a/data/custom_maps_menu.cfg b/data/custom_maps_menu.cfg
new file mode 100755 (executable)
index 0000000..cac660a
--- /dev/null
+++ b/data/custom_maps_menu.cfg
@@ -0,0 +1,71 @@
+// Custom map menu, ported from Sauerbraten, 7Year aka Xolatile.
+
+octabase = "^f7"
+octamain = "^f1"
+unmapsx  = 4
+unmapsy  = 24
+
+custommaps = ""
+
+loopfiles curmap "packages/maps" "ogz" [
+       if (< (indexof $allmaps $curmap) 0) [
+               custommaps = (concat $custommaps $curmap)
+       ]
+]
+
+sy_nume = (listlen $custommaps)
+
+showcustommaps = [sy_remaps; showgui sy_unmaps]
+
+sy_remaps = [
+       custommaps = ""
+       loopfiles curmap "packages/maps" "ogz" [
+               if (< (indexof $allmaps $curmap) 0) [
+                       custommaps = (concat $custommaps $curmap)
+               ]
+       ]
+       custommaps = (sortlist $custommaps x y [<=s $x $y])
+       amountxy = (+ (div (listlen $custommaps) $unmapsy) 1)
+       loop syxy $amountxy [
+               (concatword "custommaps" $syxy) = ""
+       ]; syxy = 0
+       loop syxy $amountxy [
+               (concatword "custommaps" $syxy)
+               loop unto $unmapsy [
+                       (concatword "custommaps" $syxy) = (concat $(concatword "custommaps" $syxy) (at $custommaps (+ (* $unmapsy $syxy) $unto)))
+               ]
+       ]; syxy = 0; unto = 0
+       sy_nume = (listlen $custommaps)
+]
+
+newgui sy_unmaps [
+       if (mod $amountxy $unmapsx) [
+               sy_unpage = (+ (div $amountxy $unmapsx) 1)
+       ] [
+               sy_unpage = (div $amountxy $unmapsx)
+       ]
+       loop syi $sy_unpage [
+               guilist [
+                       loop syj $unmapsx [
+                               if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
+                                       guistrut $unmapsy 1
+                                       guilist [
+                                               guistrut 27 1
+                                               looplist unto $(concatword "custommaps" (+ (* $syi $unmapsx) $syj )) [
+                                                       guibutton (concatword $octabase $unto) (concat map $unto) "cube"
+                                               ]
+                                       ]
+                               ]
+                       ]
+                       guibar
+                       if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
+                               guiimage (concatword "packages/maps/" (strreplace $guirolloveraction "map " "") ".jpg") $guirolloveraction 6 1 "data/cube.png"
+                       ]
+               ]
+               if (= (+ $syi 1) $sy_unpage) [
+
+               ] [
+                       guitab (concatword $octamain (+ $syi 2))
+               ]
+       ]
+] (concatword $octamain "Custom Maps (" $sy_nume ")")

diff --git a/data/default_map.cfg b/data/default_map.cfg
new file mode 100644 (file)
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 (file)
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.cfg b/data/game.cfg
new file mode 100644 (file)
index 0000000..1720ccc
--- /dev/null
+++ b/data/game.cfg
@@ -0,0 +1,31 @@
+// fps specific cfg stuff goes here
+
+togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
+sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
+
+mapcomplete = [ complete $arg1 packages/maps ogz ]
+mapcomplete map
+
+modenames = "ffa coop teamplay insta instateam effic efficteam"
+loop i (listlen $modenames) [
+    mname = (at $modenames $i)
+    alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
+    mapcomplete $mname
+]
+
+demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
+varcomplete demo demodir dmo
+
+playermodelnum = 1
+
+playermodeldir0 = "mrfixit"
+playermodelicon0 = "mrfixit"
+playermodelname0 = "Mr. Fixit"
+playermodelstory0 = [Which orc do you choose when the mission calls for an all-purpose wrecking machine? Who do you call when the odds are stacked against you? Mr. Fixit, that's who. Gifted with the ability to perform deconstructive surgery with any weapon, this orc gets the job done fast and with extreme prejudice.]
+
+playermodeldir = [getalias (concatword "playermodeldir" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelicon = [getalias (concatword "playermodelicon" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelname = [getalias (concatword "playermodelname" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelstory = [getalias (concatword "playermodelstory" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+
+playsong = [ music (concatword "music/1.ogg") playsong ]

diff --git a/data/game_fps.cfg b/data/game_fps.cfg
deleted file mode 100644 (file)
index 1720ccc..0000000
--- a/data/game_fps.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-// fps specific cfg stuff goes here
-
-togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
-sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
-
-mapcomplete = [ complete $arg1 packages/maps ogz ]
-mapcomplete map
-
-modenames = "ffa coop teamplay insta instateam effic efficteam"
-loop i (listlen $modenames) [
-    mname = (at $modenames $i)
-    alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
-    mapcomplete $mname
-]
-
-demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
-varcomplete demo demodir dmo
-
-playermodelnum = 1
-
-playermodeldir0 = "mrfixit"
-playermodelicon0 = "mrfixit"
-playermodelname0 = "Mr. Fixit"
-playermodelstory0 = [Which orc do you choose when the mission calls for an all-purpose wrecking machine? Who do you call when the odds are stacked against you? Mr. Fixit, that's who. Gifted with the ability to perform deconstructive surgery with any weapon, this orc gets the job done fast and with extreme prejudice.]
-
-playermodeldir = [getalias (concatword "playermodeldir" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelicon = [getalias (concatword "playermodelicon" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelname = [getalias (concatword "playermodelname" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelstory = [getalias (concatword "playermodelstory" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-
-playsong = [ music (concatword "music/1.ogg") playsong ]

diff --git a/packages/materials/lava.png b/packages/materials/lava.png
new file mode 100644 (file)
index 0000000..e3904bb
Binary files /dev/null and b/packages/materials/lava.png differ

diff --git a/packages/materials/water.png b/packages/materials/water.png
new file mode 100644 (file)
index 0000000..872bc81
Binary files /dev/null and b/packages/materials/water.png differ

diff --git a/packages/materials/water_dudv.png b/packages/materials/water_dudv.png
new file mode 100644 (file)
index 0000000..725a2f6
Binary files /dev/null and b/packages/materials/water_dudv.png differ

diff --git a/packages/materials/water_n.png b/packages/materials/water_n.png
new file mode 100644 (file)
index 0000000..0a44d9d
Binary files /dev/null and b/packages/materials/water_n.png differ

diff --git a/packages/materials/waterfall.png b/packages/materials/waterfall.png
new file mode 100644 (file)
index 0000000..54de3be
Binary files /dev/null and b/packages/materials/waterfall.png differ

diff --git a/packages/materials/waterfall_dudv.png b/packages/materials/waterfall_dudv.png
new file mode 100644 (file)
index 0000000..ee5f536
Binary files /dev/null and b/packages/materials/waterfall_dudv.png differ

diff --git a/packages/materials/waterfall_n.png b/packages/materials/waterfall_n.png
new file mode 100644 (file)
index 0000000..5e23fce
Binary files /dev/null and b/packages/materials/waterfall_n.png differ

diff --git a/packages/textures/floor_lava2.png b/packages/textures/floor_lava2.png
deleted file mode 100644 (file)
index e3904bb..0000000
Binary files a/packages/textures/floor_lava2.png and /dev/null differ

diff --git a/packages/textures/grass.png b/packages/textures/grass.png
deleted file mode 100644 (file)
index 845d352..0000000
Binary files a/packages/textures/grass.png and /dev/null differ

diff --git a/packages/textures/grass_aard.png b/packages/textures/grass_aard.png
deleted file mode 100644 (file)
index 8f725ed..0000000
Binary files a/packages/textures/grass_aard.png and /dev/null differ

diff --git a/packages/textures/grass_abbey.png b/packages/textures/grass_abbey.png
deleted file mode 100644 (file)
index b374a88..0000000
Binary files a/packages/textures/grass_abbey.png and /dev/null differ

diff --git a/packages/textures/grass_dead.png b/packages/textures/grass_dead.png
deleted file mode 100644 (file)
index 588f78e..0000000
Binary files a/packages/textures/grass_dead.png and /dev/null differ

diff --git a/packages/textures/grass_dg.png b/packages/textures/grass_dg.png
deleted file mode 100644 (file)
index 97815ea..0000000
Binary files a/packages/textures/grass_dg.png and /dev/null differ

diff --git a/packages/textures/grass_ik.png b/packages/textures/grass_ik.png
deleted file mode 100644 (file)
index 6a3a16f..0000000
Binary files a/packages/textures/grass_ik.png and /dev/null differ

diff --git a/packages/textures/grass_kurt.png b/packages/textures/grass_kurt.png
deleted file mode 100644 (file)
index 845d352..0000000
Binary files a/packages/textures/grass_kurt.png and /dev/null differ

diff --git a/packages/textures/grass_kurt2.png b/packages/textures/grass_kurt2.png
deleted file mode 100644 (file)
index 5f9ad3f..0000000
Binary files a/packages/textures/grass_kurt2.png and /dev/null differ

diff --git a/packages/textures/notexture.png b/packages/textures/notexture.png
deleted file mode 100644 (file)
index 1d58fa2..0000000
Binary files a/packages/textures/notexture.png and /dev/null differ

diff --git a/packages/textures/steep_fur_d.png b/packages/textures/steep_fur_d.png
deleted file mode 100644 (file)
index ba7aa22..0000000
Binary files a/packages/textures/steep_fur_d.png and /dev/null differ

diff --git a/packages/textures/steep_fur_n.png b/packages/textures/steep_fur_n.png
deleted file mode 100644 (file)
index ac1429c..0000000
Binary files a/packages/textures/steep_fur_n.png and /dev/null differ

diff --git a/packages/textures/steep_fur_z.png b/packages/textures/steep_fur_z.png
deleted file mode 100644 (file)
index dfedea4..0000000
Binary files a/packages/textures/steep_fur_z.png and /dev/null differ

diff --git a/packages/textures/texture_error.png b/packages/textures/texture_error.png
new file mode 100644 (file)
index 0000000..1d58fa2
Binary files /dev/null and b/packages/textures/texture_error.png differ

diff --git a/packages/textures/water2.png b/packages/textures/water2.png
deleted file mode 100644 (file)
index 872bc81..0000000
Binary files a/packages/textures/water2.png and /dev/null differ

diff --git a/packages/textures/water2_n.png b/packages/textures/water2_n.png
deleted file mode 100644 (file)
index 94169a9..0000000
Binary files a/packages/textures/water2_n.png and /dev/null differ

diff --git a/packages/textures/waterdudv.png b/packages/textures/waterdudv.png
deleted file mode 100644 (file)
index 725a2f6..0000000
Binary files a/packages/textures/waterdudv.png and /dev/null differ

diff --git a/packages/textures/waterfall.png b/packages/textures/waterfall.png
deleted file mode 100644 (file)
index 54de3be..0000000
Binary files a/packages/textures/waterfall.png and /dev/null differ

diff --git a/packages/textures/waterfalldudv.png b/packages/textures/waterfalldudv.png
deleted file mode 100644 (file)
index ee5f536..0000000
Binary files a/packages/textures/waterfalldudv.png and /dev/null differ

diff --git a/packages/textures/waterfalln.png b/packages/textures/waterfalln.png
deleted file mode 100644 (file)
index 5e23fce..0000000
Binary files a/packages/textures/waterfalln.png and /dev/null differ

diff --git a/packages/textures/watern.png b/packages/textures/watern.png
deleted file mode 100644 (file)
index 0a44d9d..0000000
Binary files a/packages/textures/watern.png and /dev/null differ

diff --git a/src/engine/main.cpp b/src/engine/main.cpp
index b4a4c98d0635ee85ce060ca77974417478fd2a4c..c7a88cf6d0f5824d8be04556885ddeb79f11c64c 100644 (file)
--- 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 185d972e62292c56fc688f325fb90fbfeced7c68..7f5baed5d1a0a091e30a6c95800b3eca00f1ccb0 100644 (file)
--- 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 9c5be787b9a73a75c13e11c63d664b2a54d6cfe8..9c8c5023cde4ee315530023821baf95fcc538c65 100644 (file)
--- 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 4a1d417cf843a813928a628a69951f6764e53a35..387678ceb28d2d98179387b2825d696693495040 100644 (file)
--- 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;