From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 13:06:56 +0000 (+0100)
Subject: Fix NULL texture error
X-Git-Tag: xonotic-v0.8.2~79^2~3
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=74cf20d8aee2fac7e81d1067d1cf8ea05f0f4d47;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix NULL texture error
---

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index 0d4deec9..25284b5b 100644
--- a/maps/geoplanetary.map
+++ b/maps/geoplanetary.map
@@ -2417,7 +2417,7 @@
 ( -1536 -960 448 ) ( -1536 -960 1216 ) ( -904 -960 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1536 -960 448 ) ( -1536 -896 448 ) ( -1536 -960 1216 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1104 -704 832 ) ( -848 -960 832 ) ( -1104 -960 832 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( -1152 -896 -64 ) ( -1152 -900 -64 ) ( -1152 -896 64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( -1152 -896 -64 ) ( -1152 -900 -64 ) ( -1152 -896 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -904 -896 1216 ) ( -1536 -896 1216 ) ( -904 -896 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -4048,7 +4048,7 @@
 ( 254 1768 -160 ) ( 254 1904 352 ) ( 254 1768 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 512 2032 352 ) ( 512 2168 352 ) ( 512 2032 -160 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 192 1536 352 ) ( 320 1536 -160 ) ( 320 1536 352 ) trak4x/floor-tile1 0 0 0 0.5 0.5 0 0 0
-( 512 68 -64 ) ( 508 68 -64 ) ( 512 68 64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 512 68 -64 ) ( 508 68 -64 ) ( 512 68 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -1284 32 -128 ) ( 252 1472 -128 ) ( 252 32 -128 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
@@ -4208,7 +4208,7 @@
 ( -72 2048 -128 ) ( -72 2048 384 ) ( 416 2048 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -64 2048 -128 ) ( -64 2120 -128 ) ( -64 2048 384 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 424 2048 32 ) ( 360 2056 32 ) ( 360 2048 32 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 360 2080 -64 ) ( 368 2080 -64 ) ( 360 2080 64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 360 2080 -64 ) ( 368 2080 -64 ) ( 360 2080 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 416 2112 384 ) ( -72 2112 384 ) ( 416 2112 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -23048,7 +23048,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 2048 4544 448 ) ( 2048 4544 1216 ) ( 1416 4544 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 1344 4288 1216 ) ( 1344 4288 384 ) ( 1344 4544 1216 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 1616 4288 832 ) ( 1360 4544 832 ) ( 1616 4544 832 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( 1728 4544 -64 ) ( 1728 4540 -64 ) ( 1728 4544 64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 1728 4544 -64 ) ( 1728 4540 -64 ) ( 1728 4544 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1416 4480 1216 ) ( 2048 4480 1216 ) ( 1416 4480 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -38803,7 +38803,7 @@ map_geoplanetary/wiz1_4_mesh
 ( -16 2064 -160 ) ( 208 2064 -160 ) ( -16 2208 -160 ) trak4x/floor-tile1 0 0 0 0.5 0.5 0 0 0
 ( 0 2112 -152 ) ( 0 2112 -128 ) ( 224 2112 -152 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 0 2064 -152 ) ( 0 2208 -152 ) ( 0 2064 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( 0 3516 -64 ) ( 4 3516 -64 ) ( 0 3516 64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 0 3516 -64 ) ( 4 3516 -64 ) ( 0 3516 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 32 2176 -192 ) ( 32 2112 -192 ) ( 224 2176 -192 ) exx/trim-psimple05 0 46.5454406738 90 0.25 0.34375 0 0 0
@@ -39822,24 +39822,24 @@ map_geoplanetary/wiz1_4_mesh
 ( 416 2112 384 ) ( -72 2112 384 ) ( 416 2112 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.25 0.25 0 0 0
 ( -64 2048 -128 ) ( -64 2120 -128 ) ( -64 2048 384 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 424 2048 32 ) ( 360 2056 32 ) ( 360 2048 32 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
-( 128 64 384 ) ( 128 64 376 ) ( 128 -64 384 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 128 64 384 ) ( 128 64 376 ) ( 128 -64 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 416 2120 384 ) ( 416 2048 384 ) ( -72 2120 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 416 2112 384 ) ( -72 2112 384 ) ( 416 2112 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.25 0.25 0 0 0
 ( 512 2112 384 ) ( 512 2112 -128 ) ( 512 2040 384 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 424 2048 32 ) ( 360 2056 32 ) ( 360 2048 32 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
-( 384 64 376 ) ( 384 64 384 ) ( 384 -64 376 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 384 64 376 ) ( 384 64 384 ) ( 384 -64 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 416 2120 384 ) ( 416 2048 384 ) ( -72 2120 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 416 2112 384 ) ( -72 2112 384 ) ( 416 2112 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.25 0.25 0 0 0
 ( 424 2048 32 ) ( 360 2056 32 ) ( 360 2048 32 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
-( 128 -64 384 ) ( 128 64 376 ) ( 128 64 384 ) NULL 0 0 0 0.25 0.25 0 0 0
-( 384 -64 376 ) ( 384 64 384 ) ( 384 64 376 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 360 2080 64 ) ( 368 2080 -64 ) ( 360 2080 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 128 -64 384 ) ( 128 64 376 ) ( 128 64 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 384 -64 376 ) ( 384 64 384 ) ( 384 64 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -1120 -504 352 ) ( -1120 -1656 352 ) ( -1184 -504 352 ) exx/base-metal03 384 32 0 0.25 0.25 0 0 0
@@ -39863,7 +39863,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 2048 4544 448 ) ( 2048 4544 1216 ) ( 1416 4544 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 2048 4544 448 ) ( 2048 4480 448 ) ( 2048 4544 1216 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 1616 4288 832 ) ( 1360 4544 832 ) ( 1616 4544 832 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( 1728 4544 64 ) ( 1728 4540 -64 ) ( 1728 4544 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 1728 4544 64 ) ( 1728 4540 -64 ) ( 1728 4544 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 456 2208 -128 ) ( 456 2064 -128 ) ( 232 2208 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -39871,7 +39871,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 256 2208 -128 ) ( 256 2208 -152 ) ( 256 2064 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -16 2064 -160 ) ( 208 2064 -160 ) ( -16 2208 -160 ) trak4x/floor-tile1 0 0 0 0.5 0.5 0 0 0
 ( 0 2064 -152 ) ( 0 2208 -152 ) ( 0 2064 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( 0 3516 64 ) ( 4 3516 -64 ) ( 0 3516 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 0 3516 64 ) ( 4 3516 -64 ) ( 0 3516 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 184 856 -128 ) ( 184 96 -128 ) ( -168 856 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -39879,7 +39879,7 @@ map_geoplanetary/wiz1_4_mesh
 ( -208 -256 -144 ) ( -208 -256 -128 ) ( 144 -256 -144 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 254 1768 -160 ) ( 254 1904 352 ) ( 254 1768 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 512 2032 352 ) ( 512 2168 352 ) ( 512 2032 -160 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( 512 68 64 ) ( 508 68 -64 ) ( 512 68 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( 512 68 64 ) ( 508 68 -64 ) ( 512 68 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -904 -896 1216 ) ( -1536 -896 1216 ) ( -904 -896 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
@@ -39887,7 +39887,7 @@ map_geoplanetary/wiz1_4_mesh
 ( -1536 -960 448 ) ( -1536 -960 1216 ) ( -904 -960 448 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -832 -704 1216 ) ( -832 -704 384 ) ( -832 -960 1216 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1104 -704 832 ) ( -848 -960 832 ) ( -1104 -960 832 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( -1152 -896 64 ) ( -1152 -900 -64 ) ( -1152 -896 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
+( -1152 -896 64 ) ( -1152 -900 -64 ) ( -1152 -896 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
diff --git a/maps/geoplanetary.map.options b/maps/geoplanetary.map.options
index bf62acbb..8096b39c 100644
--- a/maps/geoplanetary.map.options
+++ b/maps/geoplanetary.map.options
@@ -2,5 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 2b
+Version: 2c