Fix underwater breathing sounds playing when standing in shallow water

halflife issue #3110
twhl-community · Jun 4, 2021 · c2902f8 · c2902f8
1 parent 570da84
commit c2902f8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/dlls/player.cpp b/dlls/player.cpp
@@ -1137,15 +1137,18 @@ void CBasePlayer::WaterMove()
 
 	// make bubbles
 
-	air = (int)(pev->air_finished - gpGlobals->time);
-	if (!RANDOM_LONG(0,0x1f) && RANDOM_LONG(0,AIRTIME-1) >= air)
+	if (pev->waterlevel == 3)
 	{
-		switch (RANDOM_LONG(0,3))
+		air = (int)(pev->air_finished - gpGlobals->time);
+		if (!RANDOM_LONG(0, 0x1f) && RANDOM_LONG(0, AIRTIME - 1) >= air)
+		{
+			switch (RANDOM_LONG(0, 3))
 			{
 			case 0:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim1.wav", 0.8, ATTN_NORM); break;
 			case 1:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim2.wav", 0.8, ATTN_NORM); break;
 			case 2:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim3.wav", 0.8, ATTN_NORM); break;
 			case 3:	EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_swim4.wav", 0.8, ATTN_NORM); break;
+			}
 		}
 	}