From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 13 Sep 2011 11:46:46 +0000 (+0200)
Subject: more fixes. All EE are fixed now.
X-Git-Tag: xonotic-v0.6.0~74^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2637897836caccc05d7ba0f0962b7adc5cf96be;p=xonotic%2Fxonotic-maps.pk3dir.git

more fixes. All EE are fixed now.
---

diff --git a/scripts/metaltechx.shader b/scripts/metaltechx.shader
index a8273dea..5826b10a 100644
--- a/scripts/metaltechx.shader
+++ b/scripts/metaltechx.shader
@@ -144,7 +144,7 @@ textures/metaltechx/wall-alu_base
 textures/metaltechx/wall-alu02
 {
 	qer_editorimage textures/metaltechx/wall/alu02
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 163
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 	surfaceparm metalsteps
diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 587d14a7..74c7d8a1 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -105,7 +105,7 @@ use_texture()
 					default) # offsetmapping keyword without bias
 						getstats "../${2}_norm.tga"
 						if [ "$min" -eq "$max" ]; then
-							echo "(WW) shader $1 uses broken normalmap ${2}_norm.tga, maybe use dpoffsetmapping none?"; seterror
+							echo "(WW) shader $1 uses broken normalmap ${2}_norm.tga, maybe use dpoffsetmapping none?"
 						else
 							echo "(EE) shader $1 uses ${2}_norm.tga but lacks median (add to dpoffsetmapping: match8 $median)"; seterror
 						fi
@@ -115,7 +115,7 @@ use_texture()
 				esac
 			else
 				if [ -n "$offsetmapping_match8" ]; then
-					echo "(EE) shader $1 specifies offsetmapping, but texture $2 does not have a normalmap"
+					echo "(WW) shader $1 specifies offsetmapping, but texture $2 does not have a normalmap"
 				fi
 			fi
 		fi
diff --git a/scripts/terrain01x.shader b/scripts/terrain01x.shader
index 0e7ad244..aec13b5b 100644
--- a/scripts/terrain01x.shader
+++ b/scripts/terrain01x.shader
@@ -3,7 +3,7 @@ textures/terrain01x/blends-mars-rock01-ground01
 	qer_editorimage textures/terrain01x/blends/mars-rock01-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -34,7 +34,7 @@ textures/terrain01x/blends-mars-rock01-sand04
 	qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -65,7 +65,7 @@ textures/terrain01x/blends-mars-rock02-ground01
 	qer_editorimage textures/terrain01x/blends/mars-rock02-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 
 	q3map_lightmapSampleOffset 8
@@ -97,7 +97,7 @@ textures/terrain01x/blends-mars-rock01-ground01-projected
 	qer_editorimage textures/terrain01x/blends/mars-rock01-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -129,7 +129,7 @@ textures/terrain01x/blends-mars-rock01-sand04-projected
 	qer_editorimage textures/terrain01x/blends/mars-rock01-sand04.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -161,7 +161,7 @@ textures/terrain01x/blends-mars-rock02-ground01-projected
 	qer_editorimage textures/terrain01x/blends/mars-rock02-ground01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 
 	q3map_lightmapSampleOffset 8
@@ -195,7 +195,7 @@ textures/terrain01x/ground-barren01
 	qer_editorimage textures/terrain01x/ground/barren01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 112
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -218,7 +218,7 @@ textures/terrain01x/ground-barren02
 	qer_editorimage textures/terrain01x/ground/barren02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 207
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -241,7 +241,7 @@ textures/terrain01x/ground-drylake01
 	qer_editorimage textures/terrain01x/ground/drylake01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 184
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -264,7 +264,7 @@ textures/terrain01x/ground-drylake02
 	qer_editorimage textures/terrain01x/ground/drylake02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 184
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -287,7 +287,7 @@ textures/terrain01x/ground-goopit
 	qer_editorimage textures/terrain01x/ground/goopit.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 72
 	dpglossintensitymod  2
 	dpglossexponentmod  2
 
@@ -312,7 +312,7 @@ textures/terrain01x/ground-gravel01
 	qer_editorimage textures/terrain01x/ground/gravel01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 202
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -335,7 +335,7 @@ textures/terrain01x/ground-ice01
 	qer_editorimage textures/terrain01x/ground/ice01.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 254
 	dpglossintensitymod  2
 	dpglossexponentmod  2
 
@@ -360,7 +360,7 @@ textures/terrain01x/ground-mars01
 	qer_editorimage textures/terrain01x/ground/mars01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 186
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -383,7 +383,7 @@ textures/terrain01x/ground-mud01
 	qer_editorimage textures/terrain01x/ground/mud01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 210
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -406,7 +406,7 @@ textures/terrain01x/ground-mud02
 	qer_editorimage textures/terrain01x/ground/mud02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 177
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -429,7 +429,7 @@ textures/terrain01x/ground-sand01
 	qer_editorimage textures/terrain01x/ground/sand01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 160
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -452,7 +452,7 @@ textures/terrain01x/ground-sand02
 	qer_editorimage textures/terrain01x/ground/sand02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 197
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -475,7 +475,7 @@ textures/terrain01x/ground-sand03
 	qer_editorimage textures/terrain01x/ground/sand03.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 188
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -498,7 +498,7 @@ textures/terrain01x/ground-sand04
 	qer_editorimage textures/terrain01x/ground/sand04.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 228
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -521,7 +521,7 @@ textures/terrain01x/rock-mars01
 	qer_editorimage textures/terrain01x/rock/mars01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 229
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -544,7 +544,7 @@ textures/terrain01x/rock-mars02
 	qer_editorimage textures/terrain01x/rock/mars02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 226
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -567,7 +567,7 @@ textures/terrain01x/rock-rock01
 	qer_editorimage textures/terrain01x/rock/rock01.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 174
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -590,7 +590,7 @@ textures/terrain01x/rock-rock02
 	qer_editorimage textures/terrain01x/rock/rock02.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 145
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar
@@ -613,7 +613,7 @@ textures/terrain01x/rock-rock03
 	qer_editorimage textures/terrain01x/rock/rock03.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 2
+	dpoffsetmapping - 2 match8 166
 
 	q3map_lightmapSampleOffset 8
 	q3map_nonplanar