Per-viewport HUD messages

src/k_hud.cpp

@@ -5621,97 +5621,162 @@ typedef struct
 	sfxenum_t sound;
 } message_t;
 
-static std::deque<std::string> messages;
+typedef struct
-static tic_t messagetimer = 0;
+{
-static messagemode_t messagemode = MM_IN;
+	std::deque<std::string> messages;
+	tic_t timer = 0;
+	messagemode_t mode = MM_IN;
+	const tic_t speedyswitch = 2*TICRATE;
+	const tic_t lazyswitch = 4*TICRATE;
 
-static tic_t speedyswitch = 2*TICRATE;
+	void add(std::string msg)
-static tic_t lazyswitch = 4*TICRATE;
+	{
+		messages.push_back(msg);
+	}
+
+	void clear()
+	{
+		messages.clear();
+	}
+
+	void switch_mode(messagemode_t nextmode)
+	{
+		mode = nextmode;
+		timer = 0;
+	}
+
+	void tick()
+	{		
+		if (messages.size() == 0)
+			return;
+
+		if (timer == 0 && mode == MM_IN)
+			S_StartSound(NULL, sfx_cdfm15);
+
+		timer++;
+
+		switch (mode)
+		{
+			case MM_IN:
+				if (timer > messages[0].length())
+					switch_mode(MM_HOLD);
+				break;
+			case MM_HOLD:
+				if (messages.size() > 1 && timer > speedyswitch) // Waiting message, switch to it right away!
+					next();
+				else if (timer > lazyswitch) // If there's no pending message, we can chill for a bit.
+					switch_mode(MM_OUT);
+				break;
+			case MM_OUT:
+				if (timer > messages[0].length())
+					next();
+				break;
+		}
+	}
+
+	void next()
+	{
+		switch_mode(MM_IN);
+		if (messages.size() > 0)
+			messages.pop_front();
+	}
+
+} messagestate_t;
+
+static std::vector<messagestate_t> messagestates{MAXSPLITSCREENPLAYERS};
 
 void K_AddMessage(char *msg, boolean interrupt)
 {
-	if (interrupt)
+	for (auto &state : messagestates)
-		messages.clear();
+	{
-	messages.push_back(msg);
+		if (interrupt)
+			state.clear();
+		state.add(msg);
+	}
 }
 
+// Return value can be used for "paired" splitscreen messages, true = was displayed
 void K_AddMessageForPlayer(player_t *player, char *msg, boolean interrupt)
 {
-	if (!P_IsDisplayPlayer(player))
+	if (!player)
 		return;
-	K_AddMessage(msg, interrupt);
-}
 
-static void K_SwitchMessageMode(messagemode_t mode)
+	if (player && !P_IsDisplayPlayer(player))
-{
+		return;
-	messagemode = mode;
-	messagetimer = 0;
-}
 
-static void K_NextMessage()
+	messagestate_t *state = &messagestates[G_PartyPosition(player - players)];
-{
+
-	K_SwitchMessageMode(MM_IN);
+	if (interrupt)
-	if (messages.size() > 0)
+		state->clear();
-		messages.pop_front();
+
+	state->add(msg);
 }
 
 void K_TickMessages()
 {
-	if (messages.size() == 0)
+	for (auto &state : messagestates)
-		return;
-
-	if (messagetimer == 0 && messagemode == MM_IN)
-		S_StartSound(NULL, sfx_cdfm15);
-
-	messagetimer++;
-
-	switch (messagemode)
 	{
-		case MM_IN:
+		state.tick();
-			if (messagetimer > messages[0].length())
-				K_SwitchMessageMode(MM_HOLD);
-			break;
-		case MM_HOLD:
-			if (messages.size() > 1 && messagetimer > speedyswitch) // Waiting message, switch to it right away!
-				K_NextMessage();
-			else if (messagetimer > lazyswitch) // If there's no pending message, we can chill for a bit.
-				K_SwitchMessageMode(MM_OUT);
-			break;
-		case MM_OUT:
-			if (messagetimer > messages[0].length())
-				K_NextMessage();
-			break;
 	}
 }
 
 static void K_DrawMessageFeed(void)
 {
-	if (messages.size() == 0)
+	int i;
-		return;
+	for (i = 0; i <= splitscreen; i++)
+	{
+		messagestate_t state = messagestates[i];
 
-	std::string msg = messages[0];
+		if (state.messages.size() == 0)
+			continue;
 
-	UINT8 sublen = messagetimer;
+		std::string msg = state.messages[0];
-	if (messagemode == MM_IN)
-		sublen = messagetimer;
-	else if (messagemode == MM_HOLD)
-		sublen = msg.length();
-	else if (messagemode == MM_OUT)
-		sublen = msg.length() - messagetimer;
 
-	std::string submsg = msg.substr(0, sublen);
+		UINT8 sublen = state.timer;
+		if (state.mode == MM_IN)
+			sublen = state.timer;
+		else if (state.mode == MM_HOLD)
+			sublen = msg.length();
+		else if (state.mode == MM_OUT)
+			sublen = msg.length() - state.timer;
 
-	using srb2::Draw;
+		std::string submsg = msg.substr(0, sublen);
 
-	Draw::TextElement text(submsg);
+		using srb2::Draw;
-	text.font(Draw::Font::kMenu);
 
-	UINT8 x = 160;
+		Draw::TextElement text(submsg);
-	UINT8 y = 10;
-	UINT8 sw = text.width();
 
-	K_DrawSticker(x - sw/2, y, sw, 0, true);
+		text.font(Draw::Font::kMenu);
-	Draw(x, y).align(Draw::Align::kCenter).text(text);
+
+		UINT8 x = 160;
+		UINT8 y = 10;
+		SINT8 shift = 0;
+		if (splitscreen > 2)
+		{
+			text.font(Draw::Font::kThin);
+			shift = -2;
+
+			x = BASEVIDWIDTH/4;
+			y = 5;
+
+			if (i % 2)
+				x += BASEVIDWIDTH/2;
+
+			if (i >= 2)
+				y += BASEVIDHEIGHT / 2;
+		}
+		else if (splitscreen > 1)
+		{
+			y = 5;
+
+			if (i >= 1)
+				y += BASEVIDHEIGHT / 2;
+		}
+		UINT8 sw = text.width();
+
+		K_DrawSticker(x - sw/2, y, sw, 0, true);
+		Draw(x, y+shift).align(Draw::Align::kCenter).text(text);
+	}
 }
 
 void K_drawKartHUD(void)

src/k_kart.c

@@ -3836,8 +3836,8 @@ void K_DoGuardBreak(mobj_t *t1, mobj_t *t2) {
 	S_StartSound(t1, sfx_gbrk);
 	K_AddHitLag(t1, 24, true);
 
-	K_AddMessageForPlayer(t1->player, va("Barrier Break..."), false);
 	K_AddMessageForPlayer(t2->player, va("Smashed 'em!"), false);
+	K_AddMessageForPlayer(t1->player, va("Barrier Break..."), false);
 
 	angle_t thrangle = R_PointToAngle2(t1->x, t1->y, t2->x, t2->y);
 	P_Thrust(t1, thrangle, 7*mapobjectscale);

src/k_powerup.cpp

@@ -5,6 +5,7 @@
 #include "k_kart.h"
 #include "k_objects.h"
 #include "k_powerup.h"
+#include "k_hud.h" // K_AddMessage
 
 tic_t K_PowerUpRemaining(const player_t* player, kartitems_t powerup)
 {
@@ -52,24 +53,29 @@ void K_GivePowerUp(player_t* player, kartitems_t powerup, tic_t time)
 	switch (powerup)
 	{
 	case POWERUP_SMONITOR:
+		K_AddMessageForPlayer(player, va("Got S MONITOR!"), true);
 		K_DoInvincibility(player, time);
 		player->powerup.superTimer += time;
 		break;
 
 	case POWERUP_BARRIER:
+		K_AddMessageForPlayer(player, va("Got MEGA BARRIER!"), true);
 		player->powerup.barrierTimer += time;
 		Obj_SpawnMegaBarrier(player);
 		break;
 
 	case POWERUP_BUMPER:
+		K_AddMessageForPlayer(player, va("Got BUMPER RESTOCK!"), true);
 		K_GiveBumpersToPlayer(player, nullptr, 5);
 		break;
 
 	case POWERUP_BADGE:
+		K_AddMessageForPlayer(player, va("Got RHYTHM BADGE!"), true);
 		player->powerup.rhythmBadgeTimer += time;
 		break;
 
 	case POWERUP_SUPERFLICKY:
+		K_AddMessageForPlayer(player, va("Got SUPER FLICKY!"), true);
 		if (K_PowerUpRemaining(player, POWERUP_SUPERFLICKY))
 		{
 			Obj_ExtendSuperFlickySwarm(player->powerup.flickyController, time);