respawnrings: ensure backwards compatibility for maps which are still using the old...

diff --git a/scripts/effects_item.shader b/scripts/effects_item.shader
index 2659a742bd86d310a3743fefeee0fc3e63e516b2..233dfe74be854cd0b29d1f75ed1802a505a25480 100644 (file)
--- a/scripts/effects_item.shader
+++ b/scripts/effects_item.shader
@@ -4,7 +4,7 @@ textures/effects_item/respawnring-red
        surfaceparm nomarks
        surfaceparm trans
        {
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-red.png
+               map textures/effects_item/respawnring-red.jpg

                blendfunc add
                rgbGen identity
        }
                blendfunc add
                rgbGen identity
        }


@@ -16,67 +16,91 @@ textures/effects_item/respawnring-blue
        surfaceparm nomarks
        surfaceparm trans
        {
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-blue.png
+               map textures/effects_item/respawnring-blue.jpg

                blendfunc add
                rgbGen identity
        }
 }
 
                blendfunc add
                rgbGen identity
        }
 }
 

-textures/effects_item/respawnring-yellow
+textures/effects_item/respawnring-red-highres

 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {
 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-yellow.png
+               map textures/effects_item/respawnring-red-highres.png

                blendfunc add
                rgbGen identity
        }
 }
 
                blendfunc add
                rgbGen identity
        }
 }
 

-textures/effects_item/respawnring-black
+textures/effects_item/respawnring-blue-highres

 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {
 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-black.png
+               map textures/effects_item/respawnring-blue-highres.png

                blendfunc add
                rgbGen identity
        }
 }
 
                blendfunc add
                rgbGen identity
        }
 }
 

-textures/effects_item/respawnring-green
+textures/effects_item/respawnring-yellow-highres

 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {
 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-green.png
+               map textures/effects_item/respawnring-yellow-highres.png

                blendfunc add
                rgbGen identity
        }
 }
 
                blendfunc add
                rgbGen identity
        }
 }
 

-textures/effects_item/respawnring-purple
+textures/effects_item/respawnring-black-highres

 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {
 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-purple.png
+               map textures/effects_item/respawnring-black-highres.png

                blendfunc add
                rgbGen identity
        }
 }
 
                blendfunc add
                rgbGen identity
        }
 }
 

-textures/effects_item/respawnring-white
+textures/effects_item/respawnring-green-highres

 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {
 {
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm trans
        {

-               map textures/effects_item/respawnring-white.png
+               map textures/effects_item/respawnring-green-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-purple-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-purple-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-white-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-white-highres.png

                blendfunc add
                rgbGen identity
        }
                blendfunc add
                rgbGen identity
        }

diff --git a/textures/effects_item/respawnring-black-highres.png b/textures/effects_item/respawnring-black-highres.png
new file mode 100644 (file)
index 0000000..2e82ed0
Binary files /dev/null and b/textures/effects_item/respawnring-black-highres.png differ

diff --git a/textures/effects_item/respawnring-black.png b/textures/effects_item/respawnring-black.png
deleted file mode 100644 (file)
index 2e82ed0..0000000
Binary files a/textures/effects_item/respawnring-black.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-blue-highres.png b/textures/effects_item/respawnring-blue-highres.png
new file mode 100644 (file)
index 0000000..44de8f7
Binary files /dev/null and b/textures/effects_item/respawnring-blue-highres.png differ

diff --git a/textures/effects_item/respawnring-blue.jpg b/textures/effects_item/respawnring-blue.jpg
new file mode 100644 (file)
index 0000000..52a6385
Binary files /dev/null and b/textures/effects_item/respawnring-blue.jpg differ

diff --git a/textures/effects_item/respawnring-blue.png b/textures/effects_item/respawnring-blue.png
deleted file mode 100644 (file)
index 44de8f7..0000000
Binary files a/textures/effects_item/respawnring-blue.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-green-highres.png b/textures/effects_item/respawnring-green-highres.png
new file mode 100644 (file)
index 0000000..3ada50e
Binary files /dev/null and b/textures/effects_item/respawnring-green-highres.png differ

diff --git a/textures/effects_item/respawnring-green.png b/textures/effects_item/respawnring-green.png
deleted file mode 100644 (file)
index 3ada50e..0000000
Binary files a/textures/effects_item/respawnring-green.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-purple-highres.png b/textures/effects_item/respawnring-purple-highres.png
new file mode 100644 (file)
index 0000000..b79bb24
Binary files /dev/null and b/textures/effects_item/respawnring-purple-highres.png differ

diff --git a/textures/effects_item/respawnring-purple.png b/textures/effects_item/respawnring-purple.png
deleted file mode 100644 (file)
index b79bb24..0000000
Binary files a/textures/effects_item/respawnring-purple.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-red-highres.png b/textures/effects_item/respawnring-red-highres.png
new file mode 100644 (file)
index 0000000..8957583
Binary files /dev/null and b/textures/effects_item/respawnring-red-highres.png differ

diff --git a/textures/effects_item/respawnring-red.jpg b/textures/effects_item/respawnring-red.jpg
new file mode 100644 (file)
index 0000000..eb1562e
Binary files /dev/null and b/textures/effects_item/respawnring-red.jpg differ

diff --git a/textures/effects_item/respawnring-red.png b/textures/effects_item/respawnring-red.png
deleted file mode 100644 (file)
index 8957583..0000000
Binary files a/textures/effects_item/respawnring-red.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-white-highres.png b/textures/effects_item/respawnring-white-highres.png
new file mode 100644 (file)
index 0000000..7590cd5
Binary files /dev/null and b/textures/effects_item/respawnring-white-highres.png differ

diff --git a/textures/effects_item/respawnring-white.png b/textures/effects_item/respawnring-white.png
deleted file mode 100644 (file)
index 7590cd5..0000000
Binary files a/textures/effects_item/respawnring-white.png and /dev/null differ

diff --git a/textures/effects_item/respawnring-yellow-highres.png b/textures/effects_item/respawnring-yellow-highres.png
new file mode 100644 (file)
index 0000000..6538836
Binary files /dev/null and b/textures/effects_item/respawnring-yellow-highres.png differ

diff --git a/textures/effects_item/respawnring-yellow.png b/textures/effects_item/respawnring-yellow.png
deleted file mode 100644 (file)
index 6538836..0000000
Binary files a/textures/effects_item/respawnring-yellow.png and /dev/null differ