From 9a309b29c66e55be342d0153fdd83ea0dc9c36df Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 9 Jun 2018 18:20:59 +0100
Subject: [PATCH] * Made P_LevelInitStuff's stuff clearer. * Changed a caption
 I'd meant to modify earlier in the branch's lifespan.

---
 src/p_setup.c | 28 ++++++++++++++--------------
 src/sounds.c  |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 39c675318..dc963c6c7 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2371,19 +2371,19 @@ static void P_LevelInitStuff(void)
 		}
 
 		// obliteration station...
-		players[i].rings = players[i].spheres =
-		 players[i].xtralife = players[i].deadtimer =
-		 players[i].numboxes = players[i].totalring =
-		 players[i].laps = players[i].aiming =
-		 players[i].losstime = players[i].timeshit =
-		 players[i].marescore = players[i].lastmarescore =
-		 players[i].maxlink = players[i].startedtime =
-		 players[i].finishedtime = players[i].finishedspheres =
-		 players[i].lastmare = players[i].marebegunat =
-		 players[i].textvar = players[i].texttimer =
-		 players[i].linkcount = players[i].linktimer =
-		 players[i].flyangle = players[i].anotherflyangle =
-		 players[i].nightstime = players[i].mare =
+		players[i].rings = players[i].spheres =\
+		 players[i].xtralife = players[i].deadtimer =\
+		 players[i].numboxes = players[i].totalring =\
+		 players[i].laps = players[i].aiming =\
+		 players[i].losstime = players[i].timeshit =\
+		 players[i].marescore = players[i].lastmarescore =\
+		 players[i].maxlink = players[i].startedtime =\
+		 players[i].finishedtime = players[i].finishedspheres =\
+		 players[i].lastmare = players[i].marebegunat =\
+		 players[i].textvar = players[i].texttimer =\
+		 players[i].linkcount = players[i].linktimer =\
+		 players[i].flyangle = players[i].anotherflyangle =\
+		 players[i].nightstime = players[i].mare =\
 		 players[i].realtime = players[i].exiting = 0;
 
 		// i guess this could be part of the above but i feel mildly uncomfortable implicitly casting
@@ -2398,7 +2398,7 @@ static void P_LevelInitStuff(void)
 
 		// unset ALL the pointers. P_SetTarget isn't needed here because if this
 		// function is being called we're just going to clobber the data anyways
-		players[i].mo = players[i].followmobj = players[i].awayviewmobj = NULL;
+		players[i].mo = players[i].followmobj = players[i].awayviewmobj =\
 		players[i].capsule = players[i].axis1 = players[i].axis2 = NULL;
 	}
 }
diff --git a/src/sounds.c b/src/sounds.c
index 3382ba8a4..35b21e590 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -299,7 +299,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"s3k3d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Pop"},
   {"s3k3e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Flame Shield"},
   {"s3k3f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Bubble Shield"},
-  {"s3k40",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Attraction shot"},
+  {"s3k40",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Attraction blast"},
   {"s3k41",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Lightning Shield"},
   {"s3k42",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Twinspin"},
   {"s3k43",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR, "Flame burst"},