From edf9c4ebc55309ec35393ce3f70ed89a39ea0fab Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Tue, 28 Aug 2018 20:57:43 +0100 Subject: [PATCH] At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only --- src/screen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/screen.c b/src/screen.c index afeffbdaa..8fc554cc8 100644 --- a/src/screen.c +++ b/src/screen.c @@ -451,8 +451,11 @@ void SCR_ClosedCaptions(void) basey -= 8; else if ((modeattacking == ATTACKING_NIGHTS) || (!(maptol & TOL_NIGHTS) - && ((cv_powerupdisplay.value == 2) - || (cv_powerupdisplay.value == 1 && !splitscreen && !camera.chase)))) + && ((cv_powerupdisplay.value == 2) // "Always" + || (cv_powerupdisplay.value == 1 // "First-person only" + && ((!splitscreen && !camera.chase) + || (splitscreen && !camera2.chase)) // in 2p mode, move up only if 2p's powerup display is on + )))) basey -= 16; }