From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 29 May 2005 21:29:11 +0000 (+0000)
Subject: disable h2ohit.wav in GAME_NEXUIZ
X-Git-Tag: xonotic-v0.1.0preview~4833
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9446d4e55773d64daefe1e2b08ffe609b9560628;p=xonotic%2Fdarkplaces.git

disable h2ohit.wav in GAME_NEXUIZ


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

diff --git a/sv_phys.c b/sv_phys.c
index a44bfa4a..edb1db2c 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1171,7 +1171,7 @@ void SV_CheckWaterTransition (prvm_edict_t *ent)
 	}
 
 	// check if the entity crossed into or out of water
-	if ((ent->fields.server->watertype == CONTENTS_WATER || ent->fields.server->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME))
+	if (gamemode != GAME_NEXUIZ && ((ent->fields.server->watertype == CONTENTS_WATER || ent->fields.server->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME)))
 		SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
 	if (cont <= CONTENTS_WATER)