From 1f2743ce649fcbe350fbc7145170bf4c60067dd2 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 8 Jul 2017 11:41:20 +0100
Subject: [PATCH] Clean up the event and caption when a life is transferred.
---
src/p_user.c | 2 +-
src/sounds.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 0affcef5bf..5506925e03 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8179,7 +8179,7 @@ boolean P_GetLives(player_t *player)
}
if (maxlivesplayer != -1 && &players[maxlivesplayer] != player)
{
- if (cv_cooplives.value == 2 && P_IsLocalPlayer(&players[maxlivesplayer]))
+ if (cv_cooplives.value == 2 && (P_IsLocalPlayer(player) || P_IsLocalPlayer(&players[maxlivesplayer])))
S_StartSound(NULL, sfx_jshard); // placeholder
players[maxlivesplayer].lives--;
player->lives++;
diff --git a/src/sounds.c b/src/sounds.c
index bb050538ce..2c1c5f3af6 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -154,7 +154,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"gravch", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Recycler"},
{"itemup", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"},
{"jet", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jet engine"},
- {"jshard", true, 167, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got shard"},
+ {"jshard", true, 167, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Life transfer"}, // placeholder repurpose; original string was "Got Shard"
{"lose" , false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"},
{"lvpass", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning signpost"},
{"mindig", false, 8, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Tunnelling"},
--
GitLab