Water transition splashes do not happen for lava anymore. This means
authorknghtbrd <knghtbrd@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 29 Jul 2002 11:20:46 +0000 (11:20 +0000)
committerknghtbrd <knghtbrd@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 29 Jul 2002 11:20:46 +0000 (11:20 +0000)
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

sv_phys.c

index 76b12e2..46c5f5a 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 (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);
 
@@ -1158,7 +1158,7 @@ void SV_CheckWaterTransition (edict_t *ent)
        }
        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);