fix some shader bugs

diff --git a/scripts/effects_beam.shader b/scripts/effects_beam.shader
index 7d16df52c189372ae5793e384fb629d2f4a3cae3..f6f1ee70821e83272eff344dc6e2e84686129fb1 100644 (file)
--- a/scripts/effects_beam.shader
+++ b/scripts/effects_beam.shader
@@ -6,7 +6,7 @@ textures/effects_beam/beam-blue
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-blue.tga
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-blue.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -18,7 +18,7 @@ textures/effects_beam/beam-purple
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-purple.tga
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-purple.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -30,7 +30,7 @@ textures/effects_beam/beam-red
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-red.tga
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-red.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -42,7 +42,7 @@ textures/effects_beam/beam-green
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-green.tga
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-green.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -54,6 +54,6 @@ textures/effects_beam/beam-yellow
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-yellow.tga
        q3map_surfacelight 3000
        {
                map textures/effects_beam/beam-yellow.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
        }
 }

diff --git a/scripts/effects_healpod.shader b/scripts/effects_healpod.shader
index 525a4d59eef028e0d1288f72af4edf73e7994e01..14694347636101d13ad12c53f3f1d735f4054372 100644 (file)
--- a/scripts/effects_healpod.shader
+++ b/scripts/effects_healpod.shader
@@ -11,7 +11,7 @@ textures/effects_healpod/healpod1_d
        qer_trans 0.6
        {
                map textures/effects_healpod/healpod1_d.tga
        qer_trans 0.6
        {
                map textures/effects_healpod/healpod1_d.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 2
        }
 }
                tcMod scroll 0 2
        }
 }

diff --git a/scripts/effects_jumppad.shader b/scripts/effects_jumppad.shader
index 211eef33e4e331e8361198aa04e0fb2d77b8be2d..30eaf65728668ff438f2915cb55decf32d01af97 100644 (file)
--- a/scripts/effects_jumppad.shader
+++ b/scripts/effects_jumppad.shader
@@ -10,7 +10,7 @@ textures/effects_jumppad/jumppadfx1_a
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_a.tga
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_a.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 2
        }
 }
                tcMod scroll 0 2
        }
 }


@@ -26,7 +26,7 @@ textures/effects_jumppad/jumppadfx1_b
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_b.tga
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_b.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 2
        }
 }
                tcMod scroll 0 2
        }
 }


@@ -42,7 +42,7 @@ textures/effects_jumppad/jumppadfx1_c
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_c.tga
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_c.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 2
        }
 }
                tcMod scroll 0 2
        }
 }


@@ -58,7 +58,7 @@ textures/effects_jumppad/jumppadfx1_d
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_d.tga
        qer_trans 0.6
        {
                map textures/effects_jumppad/jumppadfx1_d.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 2
        }
 }
                tcMod scroll 0 2
        }
 }

diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index 1e89243e6974c996bdf0ac5b00acceeba8afc84a..ebb9d26db804177b752b4b0279455ee813e2374c 100644 (file)
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -22,7 +22,7 @@ textures/effects_warpzone/blueedge
        cull none
        {
                map textures/effects_warpzone/blueedge.tga
        cull none
        {
                map textures/effects_warpzone/blueedge.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -34,7 +34,7 @@ textures/effects_warpzone/rededge
        cull none
        {
                map textures/effects_warpzone/rededge.tga
        cull none
        {
                map textures/effects_warpzone/rededge.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 

diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index 5d3f2d790ddcdea264597f5883c89b99c9f918aa..036be232c1199910ac060d624cb3490f23c87539 100644 (file)
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -11,7 +11,7 @@ textures/liquids_lava/lava0
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -26,7 +26,7 @@ textures/liquids_lava/lava0_flow
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 -0.25
        }
 }
                tcMod scroll 0 -0.25
        }
 }


@@ -44,7 +44,7 @@ textures/liquids_lava/lava0_blue
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_blue.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_blue.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -59,7 +59,7 @@ textures/liquids_lava/lava0_blue_flow
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_blue.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_blue.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 -0.25
        }
 }
                tcMod scroll 0 -0.25
        }
 }


@@ -77,7 +77,7 @@ textures/liquids_lava/lava0_green
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_green.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_green.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -92,7 +92,7 @@ textures/liquids_lava/lava0_green_flow
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_green.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_green.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 -0.25
        }
 }
                tcMod scroll 0 -0.25
        }
 }


@@ -110,7 +110,7 @@ textures/liquids_lava/lava0_purple
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_purple.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_purple.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

        }
 }
 
        }
 }
 


@@ -125,7 +125,7 @@ textures/liquids_lava/lava0_purple_flow
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_purple.tga
        q3map_lightSubdivide 64
        {
                map textures/liquids_lava/lava0_purple.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                tcMod scroll 0 -0.25
        }
 }
                tcMod scroll 0 -0.25
        }
 }

diff --git a/scripts/logos.shader b/scripts/logos.shader
index a43ed83aae94c0cb03e3e8fb39975a8540956920..8028e04c33b583c066364f5b4eeed6dbc03e625a 100644 (file)
--- a/scripts/logos.shader
+++ b/scripts/logos.shader
@@ -34,7 +34,7 @@ textures/logos/logo01_blue_glowy
 
        {
                map textures/logos/logo01/logo01_blueg.tga
 
        {
                map textures/logos/logo01/logo01_blueg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -76,7 +76,7 @@ textures/logos/logo01_red_glowy
 
        {
                map textures/logos/logo01/logo01_redg.tga
 
        {
                map textures/logos/logo01/logo01_redg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -118,7 +118,7 @@ textures/logos/logo01_green_glowy
 
        {
                map textures/logos/logo01/logo01_greeng.tga
 
        {
                map textures/logos/logo01/logo01_greeng.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -160,7 +160,7 @@ textures/logos/logo01_yellow_glowy
 
        {
                map textures/logos/logo01/logo01_yellowg.tga
 
        {
                map textures/logos/logo01/logo01_yellowg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -202,7 +202,7 @@ textures/logos/logo02_red_glowy
 
        {
                map textures/logos/logo02/logo02_redg.tga
 
        {
                map textures/logos/logo02/logo02_redg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -244,7 +244,7 @@ textures/logos/logo02_blue_glowy
 
        {
                map textures/logos/logo02/logo02_blueg.tga
 
        {
                map textures/logos/logo02/logo02_blueg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -286,7 +286,7 @@ textures/logos/logo02_green_glowy
 
        {
                map textures/logos/logo02/logo02_greeng.tga
 
        {
                map textures/logos/logo02/logo02_greeng.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }


@@ -328,8 +328,8 @@ textures/logos/logo02_yellow_glowy
 
        {
                map textures/logos/logo02/logo02_yellowg.tga
 
        {
                map textures/logos/logo02/logo02_yellowg.tga

-               blendFunc add
+               blendFunc GL_SRC_ALPHA GL_ONE

                alphaFunc GT0
                rgbgen identity
        }
                alphaFunc GT0
                rgbgen identity
        }

-}
\ No newline at end of file
+}

diff --git a/scripts/map_leave_em_behind.shader b/scripts/map_leave_em_behind.shader
index 6a39b0310897f2e48f4b4ef086261d911098cdce..5e24f7565eaf16ad86177d5ce89b66bda4932cb4 100644 (file)
--- a/scripts/map_leave_em_behind.shader
+++ b/scripts/map_leave_em_behind.shader
@@ -13,7 +13,6 @@ textures/map_leave_em_behind/biolumi2_yellow
        {
                tcMod scroll 0 0.05
                map textures/map_leave_em_behind/biolumi2_yellow.tga
        {
                tcMod scroll 0 0.05
                map textures/map_leave_em_behind/biolumi2_yellow.tga

-               blendfunc blend

        }
 }
 textures/map_leave_em_behind/biolumi2_green
        }
 }
 textures/map_leave_em_behind/biolumi2_green


@@ -31,7 +30,6 @@ textures/map_leave_em_behind/biolumi2_green
        {
          tcMod scroll 0 0.05
          map textures/map_leave_em_behind/biolumi2_green.tga
        {
          tcMod scroll 0 0.05
          map textures/map_leave_em_behind/biolumi2_green.tga

-         blendfunc blend

        }
 
 }
        }
 
 }

diff --git a/scripts/model_teleporters.shader b/scripts/model_teleporters.shader
index 98222135022e3ad8fc3fffb2bd18cfbfb630c8d2..7633f21bfef1cd7093b2445eb30e495a246080a0 100644 (file)
--- a/scripts/model_teleporters.shader
+++ b/scripts/model_teleporters.shader
@@ -4,7 +4,7 @@ models/teleporters/thrust
        cull none
        {
                map models/teleporters/thrust.tga
        cull none
        {
                map models/teleporters/thrust.tga

-               blendfunc add
+               blendfunc GL_SRC_ALPHA GL_ONE

                rgbGen vertex
        }
                rgbGen vertex
        }

-}
\ No newline at end of file
+}