From 84bf6ad78533398ec3482b68f8eda0fa3ee8065b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 Feb 2020 00:38:22 +0100 Subject: [PATCH] - unused code removed --- source/sw/src/draw.cpp | 68 +----------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp index 9e2db2810..6523ede27 100644 --- a/source/sw/src/draw.cpp +++ b/source/sw/src/draw.cpp @@ -1525,36 +1525,6 @@ void DrawCheckKeys(PLAYERp pp) ResizeView(pp); } -#if 0 -void DrawMessageInput(PLAYERp pp) -{ - short w,h; - static SWBOOL cur_show; - short c; - - // Used to make cursor fade in and out - c = 4-(sintable[(totalclock<<4)&2047]>>11); - - if (MessageInputMode) - { - 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); - } - } -} -#else void DrawMessageInput(PLAYERp pp) { short w,h; @@ -1581,38 +1551,7 @@ void DrawMessageInput(PLAYERp pp) } } } -#endif -void DrawConInput(PLAYERp pp) -{ -#define PANELINPUTX 30 -#define PANELINPUTY 100 - short w,h; - static SWBOOL cur_show; - short c; - - // Used to make cursor fade in and out - c = 4-(sintable[((int32_t) totalclock<<4)&2047]>>11); - - if (ConInputMode) - { - 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); - } - } -} void DrawCrosshair(PLAYERp pp) { @@ -2326,12 +2265,7 @@ drawscreen(PLAYERp pp) // Boss Health Meter, if Boss present BossHealthMeter(); - if (ConInputMode) - { - DrawConInput(pp); // Console panel input mode - } - else - DrawMessageInput(pp); // This is only used for non-multiplayer input now + DrawMessageInput(pp); // This is only used for non-multiplayer input now DrawCompass(pp); UpdateMiniBar(pp);