Commit 0ef42ff1 authored by Evan Ramos's avatar Evan Ramos
Browse files

SW: Fix identical branches warnings

parent cce1bf84
......@@ -1748,18 +1748,10 @@ void DrawMessageInput(void)
MNU_MeasureString(MessageInputString, &w, &h);
cur_show ^= 1;
if (cur_show)
{
MNU_DrawString(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,1,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+7)<<16,(MESSAGE_LINE+3)<<16,64<<9,0,COINCURSOR+((totalclock>>3)%7),c,0,
(ROTATE_SPRITE_SCREEN_CLIP),0,0,xdim-1,ydim-1);
}
else
{
MNU_DrawString(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,1,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+7)<<16,(MESSAGE_LINE+3)<<16,64<<9,0,COINCURSOR+((totalclock>>3)%7),c,0,
(ROTATE_SPRITE_SCREEN_CLIP),0,0,xdim-1,ydim-1);
}
MNU_DrawString(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,1,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+7)<<16,(MESSAGE_LINE+3)<<16,64<<9,0,COINCURSOR+((totalclock>>3)%7),c,0,
(ROTATE_SPRITE_SCREEN_CLIP),0,0,xdim-1,ydim-1);
}
}
#else
......@@ -1777,16 +1769,9 @@ void DrawMessageInput(void)
MNU_MeasureSmallString(MessageInputString, &w, &h);
cur_show ^= 1;
if (cur_show)
{
minigametext(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+2)<<16,(MESSAGE_LINE+1)<<16,20000,0,COINCURSOR+(((int32_t) totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
else
{
minigametext(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+2)<<16,(MESSAGE_LINE+1)<<16,20000,0,COINCURSOR+(((int32_t) totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
minigametext(TEXT_XCENTER(w), MESSAGE_LINE, MessageInputString,ROTATE_SPRITE_SCREEN_CLIP);
rotatesprite((TEXT_XCENTER(w)+w+2)<<16,(MESSAGE_LINE+1)<<16,20000,0,COINCURSOR+(((int32_t) totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
}
#endif
......@@ -1807,18 +1792,10 @@ void DrawConInput(void)
MNU_MeasureSmallString(MessageInputString, &w, &h);
cur_show ^= 1;
if (cur_show)
{
MNU_DrawSmallString(PANELINPUTX, PANELINPUTY, MessageInputString,1,17);
rotatesprite((PANELINPUTX+w+1)<<16,(PANELINPUTY)<<16,65536L,0,2992,c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
//rotatesprite((PANELINPUTX+w+3)<<16,(PANELINPUTY)<<16,64<<8,0,COINCURSOR+((totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
else
{
MNU_DrawSmallString(PANELINPUTX, PANELINPUTY, MessageInputString,1,17);
rotatesprite((PANELINPUTX+w+1)<<16,(PANELINPUTY)<<16,65536L,0,2992,c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
//rotatesprite((PANELINPUTX+w+3)<<16,(PANELINPUTY)<<16,64<<8,0,COINCURSOR+((totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
MNU_DrawSmallString(PANELINPUTX, PANELINPUTY, MessageInputString,1,17);
rotatesprite((PANELINPUTX+w+1)<<16,(PANELINPUTY)<<16,65536L,0,2992,c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
//rotatesprite((PANELINPUTX+w+3)<<16,(PANELINPUTY)<<16,64<<8,0,COINCURSOR+((totalclock>>3)%7),c,0,ROTATE_SPRITE_SCREEN_CLIP,0,0,xdim-1,ydim-1);
}
}
......
......@@ -76,12 +76,6 @@ DoSectorObjectSetScale(short match)
if (sop->scale_speed > 0)
sop->scale_speed = -sop->scale_speed;
}
else if (sop->scale_dist == sop->scale_dist_min)
{
// make it positive
if (sop->scale_speed < 0)
sop->scale_speed = -sop->scale_speed;
}
else
{
// make it positive
......
......@@ -8007,12 +8007,10 @@ domovethings(void)
UpdateConMessages(); // Update the console messages
#if SYNC_TEST
#ifndef DEBUG // in DEBUG mode even TEN does sync all the time
if (/* CTW REMOVED !gTenActivated ||*/ !(movefifoplc & 0x3f))
getsyncstat();
#ifdef DEBUG // in DEBUG mode even TEN does sync all the time
else
getsyncstat();
#endif
getsyncstat();
#endif
// count the number of times this loop is called and use
......
......@@ -19825,14 +19825,21 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
over = over_sp->sectnum;
under = under_sp->sectnum;
 
#if 0
// This code originally had identical branches.
// TODO: PedanticMode - verify implications of change, enable or remove
if (GetOverlapSector(*x, *y, &over, &under) == 2)
{
*sectnum = under;
}
else
{
*sectnum = under;
*sectnum = PedanticMode ? under : over;
}
#else
GetOverlapSector(*x, *y, &over, &under);
*sectnum = under;
#endif
 
*z = sector[under_sp->sectnum].ceilingz + Z(1);
 
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment