make the repo pass the audit; move two textures to nexcompat (actually, q3 compat)

diff --git a/scripts/common.shader b/scripts/common.shader
index db7e2841241e13c5cecbbee86d5ec95b625c5f8b..f544e10e593669057615c5cf67d5cbdc482ace8e 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -216,7 +216,7 @@ textures/common/warpzone
        surfaceparm trans\r
        surfaceparm nomarks\r
        {\r
        surfaceparm trans\r
        surfaceparm nomarks\r
        {\r

-               map textures/common/mirror1.tga // fully transparent\r
+               map textures/common/warpzone/trans.tga // fully transparent\r

                blendfunc blend\r
        }\r
        dp_camera\r
                blendfunc blend\r
        }\r
        dp_camera\r


@@ -226,7 +226,7 @@ textures/common/warpzone
 textures/common/camera\r
 {\r
        {\r
 textures/common/camera\r
 {\r
        {\r

-               map textures/common/mirror1.tga // fully transparent\r
+               map textures/common/warpzone/trans.tga // fully transparent\r

                blendfunc blend\r
        }\r
        dp_camera\r
                blendfunc blend\r
        }\r
        dp_camera\r

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 8076dea9eeee87014ab2e605d9530944bfb019e1..9b5d9d94f7ee707dd14993ba7ecadb1704d756a0 100644 (file)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -165,5 +165,11 @@ textures_avail=`( cd ..; find textures/ -type f -not -name '*_norm.*' -not -name
 textures_used=`echo "${textures_used#$LF}" | sort -u`
 
 echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
 textures_used=`echo "${textures_used#$LF}" | sort -u`
 
 echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do

-       echo "(EE) texture $L is not referenced by any shader"
+       case "$L" in
+               textures/radiant/*)
+                       ;;
+               *)
+                       echo "(EE) texture $L is not referenced by any shader"
+                       ;;
+       esac

 done
 done

diff --git a/textures/common/mirror1.tga b/textures/common/mirror1.tga
deleted file mode 100644 (file)
index 2f2d654..0000000
Binary files a/textures/common/mirror1.tga and /dev/null differ

diff --git a/textures/common/warpzone/trans.tga b/textures/common/warpzone/trans.tga
new file mode 100644 (file)
index 0000000..2f2d654
Binary files /dev/null and b/textures/common/warpzone/trans.tga differ

diff --git a/textures/common/white.tga b/textures/common/white.tga
deleted file mode 100644 (file)
index fa786f2..0000000
Binary files a/textures/common/white.tga and /dev/null differ