Fix scroller merge

This commit is contained in:
Sally Coolatta 2021-02-28 23:01:46 -05:00
parent caa5314866
commit 7dca95da14
2 changed files with 4 additions and 4 deletions

View file

@ -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)

View file

@ -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]])
{