GAME: Incorrect assignment of the drowning sound to the selected play…

…er model #121

code/cgame/cg_event.c

@@ -1090,9 +1090,7 @@ void CG_EntityEvent(centity_t *cent, vec3_t position) {
 	case EV_DEATH1:
 	case EV_DEATH2:
 	case EV_DEATH3:
-		// TODO: temporary disabled - see https://github.com/PadWorld-Entertainment/worldofpadman/issues/36
-		// missing sounds in wop - once we have them - we should activate this.
-		if (0 && CG_WaterLevel(cent) == WL_DIVING) {
+		if (CG_WaterLevel(cent) == WL_DIVING) {
 			trap_S_StartSound(NULL, es->number, CHAN_VOICE, CG_CustomSound(es->number, "*drown"));
 		} else {
 			trap_S_StartSound(NULL, es->number, CHAN_VOICE,

code/game/g_active.c

@@ -123,11 +123,6 @@ static void P_WorldEffects(gentity_t *ent) {
 				if (ent->damage > 15)
 					ent->damage = 15;
 
-				// play a gurp sound instead of a normal pain sound
-				if (ent->health <= ent->damage) {
-					G_Sound(ent, CHAN_VOICE, G_SoundIndex("*drown"));
-				}
-
 				// don't play a normal pain sound
 				ent->pain_debounce_time = level.time + 200;