From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 11:52:02 +0000 (+0200)
Subject: moving warpzone shaders to effects_warpzone part II
X-Git-Tag: xonotic-v0.1.0preview~151^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18aeb1aec6fe1953c002893b1ce3ef1d5fafe920;p=xonotic%2Fxonotic-maps.pk3dir.git

moving warpzone shaders to effects_warpzone part II
---

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 3a73b7f5..d0912012 100644
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -22871,7 +22871,7 @@ exx/trim/trim_01
 // brush 0
 {
 ( 1312 176 96 ) ( 1312 144 96 ) ( 1120 176 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
 ( 1280 176 128 ) ( 1280 176 -32 ) ( 1280 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1312 144 -32 ) ( 1120 176 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1120 144 128 ) ( 1312 144 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -22886,7 +22886,7 @@ exx/trim/trim_01
 // brush 0
 {
 ( -560 160 144 ) ( -528 288 144 ) ( -528 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
 ( -560 288 144 ) ( -528 288 16 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 16 ) ( -528 160 16 ) ( -528 288 16 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -528 288 16 ) ( -528 160 144 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
diff --git a/models/warpzone/warpzone-blueedge.md3 b/models/warpzone/warpzone-blueedge.md3
index b0daad14..ab8cbcdd 100644
Binary files a/models/warpzone/warpzone-blueedge.md3 and b/models/warpzone/warpzone-blueedge.md3 differ
diff --git a/models/warpzone/warpzone-rededge.md3 b/models/warpzone/warpzone-rededge.md3
index d6f6c1bc..bdd656a9 100644
Binary files a/models/warpzone/warpzone-rededge.md3 and b/models/warpzone/warpzone-rededge.md3 differ
diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index 81761ec1..ed896e1e 100644
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -1,11 +1,11 @@
-textures/warpzone/warpzone-wavy
+textures/effects_warpzone/wavy
 {
 	surfaceparm nolightmap
 	// surfaceparm nonsolid // no, it must be solid like trigger
 	surfaceparm trans
 	surfaceparm nomarks
 	{
-		map textures/warpzone/warpzone-wavy.tga
+		map textures/effects_warpzone/wavy.tga
 		tcMod scroll 0.06 0.06
 		blendfunc blend
 	}
@@ -13,26 +13,26 @@ textures/warpzone/warpzone-wavy
 	dp_refract 1 1 1 1 // makes the camera render like a refraction
 }
 
-textures/warpzone/warpzone-blueedge
+textures/effects_warpzone/blueedge
 {
 	surfaceparm nonsolid
 	surfaceparm nomarks
 	q3map_surfacelight 2500
 	cull none
 	{
-		map textures/warpzone/warpzone-blueedge.tga
+		map textures/effects_warpzone/blueedge.tga
 		blendfunc add
 	}
 }
 
-textures/warpzone/warpzone-rededge
+textures/effects_warpzone/rededge
 {
 	surfaceparm nonsolid
 	surfaceparm nomarks
 	q3map_surfacelight 2500
 	cull none
 	{
-		map textures/warpzone/warpzone-rededge.tga
+		map textures/effects_warpzone/rededge.tga
 		blendfunc add
 	}
 }
diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index d125784a..1b256729 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -148,8 +148,8 @@ use_texture()
 					;;
 			esac
 			;;
-		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, warpzone
-		textures/decals/*|textures/liquids_*/*|textures/warpzone/*|textures/effects_*/*)
+		## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava
+		textures/decals/*|textures/liquids_*/*|textures/effects_*/*)
 			pre=`echo "$1" | cut -d / -f 1-2`
 			case "$2" in
 				"$pre"/*)