teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- unused code removed

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-14 00:38:22 +01:00
parent 844dcc22ae
commit 84bf6ad785
1 changed files with 1 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
source/sw/src/draw.cpp
View file

@ -1525,36 +1525,6 @@ void DrawCheckKeys(PLAYERp pp)
ResizeView(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) void DrawMessageInput(PLAYERp pp)
{ {
short w,h; 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) void DrawCrosshair(PLAYERp pp)
{ {
@ -2326,12 +2265,7 @@ drawscreen(PLAYERp pp)
// Boss Health Meter, if Boss present // Boss Health Meter, if Boss present
BossHealthMeter(); BossHealthMeter();
if (ConInputMode) DrawMessageInput(pp); // This is only used for non-multiplayer input now
{
DrawConInput(pp); // Console panel input mode
}
else
DrawMessageInput(pp); // This is only used for non-multiplayer input now
DrawCompass(pp); DrawCompass(pp);
UpdateMiniBar(pp); UpdateMiniBar(pp);