stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-16 17:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give input display V_PERPLAYER

Browse source
This commit is contained in:
James R 2020-01-03 16:55:26 -08:00
parent 40f4bd9a79
commit 5fd52a1141
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/st_stuff.c
View file

@ -989,7 +989,7 @@ static void ST_drawInput(void)
if (!( translucency = st_translucency ))/* nothing to see here */
return;
flags |= V_HUDTRANS;
flags |= V_HUDTRANS|V_PERPLAYER;
}
if (stplyr->powers[pw_carry] == CR_NIGHTSMODE)
@ -999,34 +999,34 @@ static void ST_drawInput(void)
return;
// O backing
V_DrawFillMaybeFade(x, y-1, 16, 16, hudinfo[HUD_LIVES].f|20, translucency);
V_DrawFillMaybeFade(x, y+15, 16, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x, y-1, 16, 16, hudinfo[HUD_LIVES].f|flags|20, translucency);
V_DrawFillMaybeFade(x, y+15, 16, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
if (cv_showinputjoy.value) // joystick render!
{
/*V_DrawFillMaybeFade(x , y , 16, 1, hudinfo[HUD_LIVES].f|16, translucency);
V_DrawFillMaybeFade(x , y+15, 16, 1, hudinfo[HUD_LIVES].f|16, translucency);
V_DrawFillMaybeFade(x , y+ 1, 1, 14, hudinfo[HUD_LIVES].f|16, translucency);
V_DrawFillMaybeFade(x+15, y+ 1, 1, 14, hudinfo[HUD_LIVES].f|16, translucency); -- red's outline*/
/*V_DrawFillMaybeFade(x , y , 16, 1, hudinfo[HUD_LIVES].f|flags|16, translucency);
V_DrawFillMaybeFade(x , y+15, 16, 1, hudinfo[HUD_LIVES].f|flags|16, translucency);
V_DrawFillMaybeFade(x , y+ 1, 1, 14, hudinfo[HUD_LIVES].f|flags|16, translucency);
V_DrawFillMaybeFade(x+15, y+ 1, 1, 14, hudinfo[HUD_LIVES].f|flags|16, translucency); -- red's outline*/
if (stplyr->cmd.sidemove || stplyr->cmd.forwardmove)
{
// joystick hole
V_DrawFillMaybeFade(x+5, y+4, 6, 6, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+5, y+4, 6, 6, hudinfo[HUD_LIVES].f|flags|29, translucency);
// joystick top
V_DrawFillMaybeFade(x+3+stplyr->cmd.sidemove/12,
y+2-stplyr->cmd.forwardmove/12,
10, 10, hudinfo[HUD_LIVES].f|29, translucency);
10, 10, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+3+stplyr->cmd.sidemove/9,
y+1-stplyr->cmd.forwardmove/9,
10, 10, accent, translucency);
10, 10, flags|accent, translucency);
}
else
{
// just a limited, greyed out joystick top
V_DrawFillMaybeFade(x+3, y+11, 10, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+3, y+11, 10, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+3,
y+1,
10, 10, hudinfo[HUD_LIVES].f|16, translucency);
10, 10, hudinfo[HUD_LIVES].f|flags|16, translucency);
}
}
else // arrows!
@ -1035,15 +1035,15 @@ static void ST_drawInput(void)
if (stplyr->cmd.sidemove < 0)
{
offs = 0;
col = accent;
col = flags|accent;
}
else
{
offs = 1;
col = hudinfo[HUD_LIVES].f|16;
V_DrawFillMaybeFade(x- 2, y+10, 6, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+ 4, y+ 9, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+ 5, y+ 8, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
col = hudinfo[HUD_LIVES].f|flags|16;
V_DrawFillMaybeFade(x- 2, y+10, 6, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+ 4, y+ 9, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+ 5, y+ 8, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
}
V_DrawFillMaybeFade(x- 2, y+ 5-offs, 6, 6, col, translucency);
V_DrawFillMaybeFade(x+ 4, y+ 6-offs, 1, 4, col, translucency);
@ -1053,17 +1053,17 @@ static void ST_drawInput(void)
if (stplyr->cmd.forwardmove > 0)
{
offs = 0;
col = accent;
col = flags|accent;
}
else
{
offs = 1;
col = hudinfo[HUD_LIVES].f|16;
V_DrawFillMaybeFade(x+ 5, y+ 3, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+ 6, y+ 4, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+ 7, y+ 5, 2, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+ 9, y+ 4, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+10, y+ 3, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
col = hudinfo[HUD_LIVES].f|flags|16;
V_DrawFillMaybeFade(x+ 5, y+ 3, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+ 6, y+ 4, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+ 7, y+ 5, 2, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+ 9, y+ 4, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+10, y+ 3, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
}
V_DrawFillMaybeFade(x+ 5, y- 2-offs, 6, 6, col, translucency);
V_DrawFillMaybeFade(x+ 6, y+ 4-offs, 4, 1, col, translucency);
@ -1073,15 +1073,15 @@ static void ST_drawInput(void)
if (stplyr->cmd.sidemove > 0)
{
offs = 0;
col = accent;
col = flags|accent;
}
else
{
offs = 1;
col = hudinfo[HUD_LIVES].f|16;
V_DrawFillMaybeFade(x+12, y+10, 6, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+11, y+ 9, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
V_DrawFillMaybeFade(x+10, y+ 8, 1, 1, hudinfo[HUD_LIVES].f|29, translucency);
col = hudinfo[HUD_LIVES].f|flags|16;
V_DrawFillMaybeFade(x+12, y+10, 6, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+11, y+ 9, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
V_DrawFillMaybeFade(x+10, y+ 8, 1, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
}
V_DrawFillMaybeFade(x+12, y+ 5-offs, 6, 6, col, translucency);
V_DrawFillMaybeFade(x+11, y+ 6-offs, 1, 4, col, translucency);
@ -1091,13 +1091,13 @@ static void ST_drawInput(void)
if (stplyr->cmd.forwardmove < 0)
{
offs = 0;
col = accent;
col = flags|accent;
}
else
{
offs = 1;
col = hudinfo[HUD_LIVES].f|16;
V_DrawFillMaybeFade(x+ 5, y+17, 6, 1, hudinfo[HUD_LIVES].f|29, translucency);
col = hudinfo[HUD_LIVES].f|flags|16;
V_DrawFillMaybeFade(x+ 5, y+17, 6, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);
}
V_DrawFillMaybeFade(x+ 5, y+12-offs, 6, 6, col, translucency);
V_DrawFillMaybeFade(x+ 6, y+11-offs, 4, 1, col, translucency);
@ -1108,13 +1108,13 @@ static void ST_drawInput(void)
if (stplyr->cmd.buttons & butt)\
{\
offs = 0;\
col = accent;\
col = flags|accent;\
}\
else\
{\
offs = 1;\
col = hudinfo[HUD_LIVES].f|16;\
V_DrawFillMaybeFade(x+16+(xoffs), y+9+(yoffs), 10, 1, hudinfo[HUD_LIVES].f|29, translucency);\
col = hudinfo[HUD_LIVES].f|flags|16;\
V_DrawFillMaybeFade(x+16+(xoffs), y+9+(yoffs), 10, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);\
}\
V_DrawFillMaybeFade(x+16+(xoffs), y+(yoffs)-offs, 10, 10, col, translucency);\
V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|flags|symb, false)
@ -1122,7 +1122,7 @@ static void ST_drawInput(void)
drawbutt( 4,-3, BT_JUMP, 'J');
drawbutt(15,-3, BT_USE, 'S');
V_DrawFillMaybeFade(x+16+4, y+8, 21, 10, hudinfo[HUD_LIVES].f|20, translucency); // sundial backing
V_DrawFillMaybeFade(x+16+4, y+8, 21, 10, hudinfo[HUD_LIVES].f|flags|20, translucency); // sundial backing
if (stplyr->mo)
{
UINT8 i, precision;
@ -1135,18 +1135,18 @@ static void ST_drawInput(void)
ycomp = 3;
if (ycomp > 0)
V_DrawFillMaybeFade(x+16+13-xcomp, y+11-ycomp, 3, 3, accent, translucency); // point (behind)
V_DrawFillMaybeFade(x+16+13-xcomp, y+11-ycomp, 3, 3, flags|accent, translucency); // point (behind)
precision = max(3, abs(xcomp));
for (i = 0; i < precision; i++) // line
{
V_DrawFillMaybeFade(x+16+14-(i*xcomp)/precision,
y+12-(i*ycomp)/precision,
1, 1, hudinfo[HUD_LIVES].f|16, translucency);
1, 1, hudinfo[HUD_LIVES].f|flags|16, translucency);
}
if (ycomp <= 0)
V_DrawFillMaybeFade(x+16+13-xcomp, y+11-ycomp, 3, 3, accent, translucency); // point (in front)
V_DrawFillMaybeFade(x+16+13-xcomp, y+11-ycomp, 3, 3, flags|accent, translucency); // point (in front)
}
#undef drawbutt