From 7dca95da147a3376a6f54b0d90967611a9674788 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 28 Feb 2021 23:01:46 -0500
Subject: [PATCH] Fix scroller merge

---
 src/p_spec.c | 6 +++---
 src/p_user.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index 4b04be5d8..300e9b51a 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -7315,9 +7315,6 @@ static void P_SpawnScrollers(void)
 
 		if (special == 507) // front and back scrollers
 		{
-			register INT32 s;
-			TAG_ITER_DECLARECOUNTER(0);
-
 			if (s != 0xffff)
 			{
 				bx = -(sides[s].textureoffset);
@@ -7327,6 +7324,9 @@ static void P_SpawnScrollers(void)
 
 		switch (special)
 		{
+			register INT32 s;
+			TAG_ITER_DECLARECOUNTER(0);
+
 			case 513: // scroll effect ceiling
 			case 533: // scroll and carry objects on ceiling
 				TAG_ITER_SECTORS(0, tag, s)
diff --git a/src/p_user.c b/src/p_user.c
index e306eb4d7..e1d6838b5 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -3740,7 +3740,7 @@ static void P_CalcPostImg(player_t *player)
 		pviewheight = player->awayviewmobj->z + 20*FRACUNIT;
 	}
 
-	for (i = 0; i <= r_splitscreen; i++)
+	for (i = 0; i <= (unsigned)r_splitscreen; i++)
 	{
 		if (player == &players[displayplayers[i]])
 		{