Water transition splashes do not happen for lava anymore. This means

lavaballs do not drive one ABSOLUTELY INSANE anymore.  (Except when you
get hit by them and they knock you into said lava, but that's another
story entirely..)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2117 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sv_phys.c b/sv_phys.c
index 76b12e25f27b8d8b176f4392bce15be6b24cd263..46c5f5a04d9c28f26d96c8727db21f3def10d716 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1149,7 +1149,7 @@ void SV_CheckWaterTransition (edict_t *ent)
 
        if (cont <= CONTENTS_WATER)
        {
 
        if (cont <= CONTENTS_WATER)
        {

-               if (ent->v.watertype == CONTENTS_EMPTY)
+               if (ent->v.watertype == CONTENTS_EMPTY && cont != CONTENTS_LAVA)

                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 


@@ -1158,7 +1158,7 @@ void SV_CheckWaterTransition (edict_t *ent)
        }
        else
        {
        }
        else
        {

-               if (ent->v.watertype != CONTENTS_EMPTY)
+               if (ent->v.watertype != CONTENTS_EMPTY && ent->v.watertype != CONTENTS_LAVA)

                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);