Fix model path

diff --git a/maps/erbium.map b/maps/erbium.map
index 0d4ac94409d0990fb21bb8ee1a76f7e502c03834..77fd5ab661bc13cb6934f4e42cfaa6bb521cecbc 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -3,6 +3,7 @@
 "author" "Justin, Mirio"
 "message" "Erbium"
 "_description" "Industrial, nature... Duel!"
+"model" "models/effects_warpzone/blueedge.md3"
 {
 brushDef
 {
@@ -4959,17 +4960,6 @@ brushDef
 {
 brushDef
 {
-( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 2144 388 -64 ) ( 2128 404 -64 ) ( 2144 388 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( 1008 248 272 ) ( 1036 174 272 ) ( 1008 174 272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 1036 248 272 ) ( 1036 174 268 ) ( 1036 174 272 ) ( ( 0.0131578948 0 509.5263366699 ) ( 0 0.25 4 ) ) exx/trim-horz01 134217728 0 0
 ( 1036 248 268 ) ( 1008 174 268 ) ( 1036 174 268 ) ( ( 0.0135135138 0 125.648651123 ) ( 0 0.0357142873 37 ) ) phillipk2x/lights-pk02_light01a-surfacelight 134217728 0 0
@@ -7537,7 +7527,7 @@ brushDef
 ( 1968 388 660 ) ( 2288 404 660 ) ( 2296 388 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 1968 388 636 ) ( 2288 404 636 ) ( 1968 404 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 2052 388 -132 ) ( 2044 404 -132 ) ( 2052 388 -4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 2128 404 -64 ) ( 2132 400 -64 ) ( 2128 404 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2128 400 -64 ) ( 2128 392 -64 ) ( 2128 400 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
 }
 {
@@ -11609,8 +11599,8 @@ brushDef
 ( 2144 596 144 ) ( 2144 580 144 ) ( 2144 596 272 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 2128 556 160 ) ( 2128 564 160 ) ( 2128 556 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 2128 404 288 ) ( 2112 404 160 ) ( 2128 404 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 2136 380 160 ) ( 2128 380 160 ) ( 2136 380 288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 2136 384 160 ) ( 2128 384 160 ) ( 2136 384 288 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 1924 400 636 ) ( 1924 392 636 ) ( 1796 400 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 1924 348 496 ) ( 1924 356 496 ) ( 1796 348 496 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
@@ -21130,6 +21120,17 @@ brushDef
 ( -488 -972 64 ) ( -487 -973 -64 ) ( -488 -972 -64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
 }
+{
+brushDef
+{
+( 2144 416 660 ) ( 2144 384 660 ) ( 2128 416 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2144 416 660 ) ( 2144 416 636 ) ( 2144 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2128 384 636 ) ( 2144 384 636 ) ( 2128 416 636 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2128 384 636 ) ( 2128 416 636 ) ( 2128 384 660 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 2140 500 -64 ) ( 2144 500 -64 ) ( 2140 500 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 2129 384 64 ) ( 2137 384 -64 ) ( 2129 384 -64 ) ( ( 0.0078125 0 511.9921875 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+}
+}
 }
 {
 "classname" "info_player_deathmatch"

diff --git a/maps/erbium.map.options b/maps/erbium.map.options
index 6bedeb066d38a1f2b872c9c5c466488c1a61d19c..3a25e7f6c56e45153e3e8c698e43d945c91ff988 100644 (file)
--- a/maps/erbium.map.options
+++ b/maps/erbium.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 7a
\ No newline at end of file
+Version: 7b
\ No newline at end of file

diff --git a/models/map_erbium/armor-room-rock.ase b/models/map_erbium/armor-room-rock.ase
index 78544a5c0f0ef64aefe0a59a6a7bf2dd1714537f..3f9ce3865946abfe52428e6ab73804360e3b8a81 100644 (file)
--- a/models/map_erbium/armor-room-rock.ase
+++ b/models/map_erbium/armor-room-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/armor-room-terrain.ase b/models/map_erbium/armor-room-terrain.ase
index ca186e8024d85f2eb20eb89948f88bb91c07cd53..dfed274b1f1b039d73f59c44dd3eb43526ac19cf 100644 (file)
--- a/models/map_erbium/armor-room-terrain.ase
+++ b/models/map_erbium/armor-room-terrain.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/bottom-corridor.ase b/models/map_erbium/bottom-corridor.ase
index d041a9cfead2ae79cdab8b7f9d6f1e30cab95f06..00f704081ba7c47b3bdb3b688438a4e50f48e5ba 100644 (file)
--- a/models/map_erbium/bottom-corridor.ase
+++ b/models/map_erbium/bottom-corridor.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/corridor-rock.ase b/models/map_erbium/corridor-rock.ase
index dacb34c15354767b1c454fa2bccd53d8ff8ffd5e..8aea855167a092a8c8e121c26e5cb2211ba54493 100644 (file)
--- a/models/map_erbium/corridor-rock.ase
+++ b/models/map_erbium/corridor-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/litlle-cave.ase b/models/map_erbium/litlle-cave.ase
index be8cb60d560f357ca082ec54ad150c332cad1a5d..c3796008d592ba8c23c623d67e24edccd4257a1f 100644 (file)
--- a/models/map_erbium/litlle-cave.ase
+++ b/models/map_erbium/litlle-cave.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/mega-rock-close.ase b/models/map_erbium/mega-rock-close.ase
index becd0ef1110e9e1886a3cd409ea2754d28fb9266..4c4b67fe6cfde0656d9cf4f01a7a05b039ae6edd 100644 (file)
--- a/models/map_erbium/mega-rock-close.ase
+++ b/models/map_erbium/mega-rock-close.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/mega-rock-main.ase b/models/map_erbium/mega-rock-main.ase
index bb89d171251821351f9ce8829bf3d143d60c5542..b8c7434f14fa83f5ea787e97c138dff416a2ca4c 100644 (file)
--- a/models/map_erbium/mega-rock-main.ase
+++ b/models/map_erbium/mega-rock-main.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/waterfall-room-rock-small.ase b/models/map_erbium/waterfall-room-rock-small.ase
index f8d5721fae6586b75c6d6e79e679742d44174687..ed40a7e8aea92603ef8a5c26adb7313ca519bbd6 100644 (file)
--- a/models/map_erbium/waterfall-room-rock-small.ase
+++ b/models/map_erbium/waterfall-room-rock-small.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r

diff --git a/models/map_erbium/waterfall-room-rock.ase b/models/map_erbium/waterfall-room-rock.ase
index e61ce63e387cea33732a0277db77b61ad1b8f94a..2bae021d2211680f10a2a9caae8aad008846ea8c 100644 (file)
--- a/models/map_erbium/waterfall-room-rock.ase
+++ b/models/map_erbium/waterfall-room-rock.ase
@@ -12,7 +12,7 @@
 *MATERIAL_LIST {\r
        *MATERIAL_COUNT 1\r
        *MATERIAL 0 {\r
-               *MATERIAL_NAME "rocktomoss"\r
+               *MATERIAL_NAME "textures/map_erbium/rocktomoss"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_AMBIENT 0.5882        0.5882  0.5882\r
                *MATERIAL_DIFFUSE 0.5882        0.5882  0.5882\r