Nametags Rewrites
This commit is contained in:
1 parent
65c15126f1
commit
02177a7794
7 files changed
+246
-120
No files matched your search
+1
-1
@@ -1483,7 +1483,7 @@ void D_SRB2Main(void)
|
||||
statdp = true;
|
||||
|
||||
// Nametag stuffs
|
||||
if (W_CheckMultipleLumps("NTLINE", "NTLINEV", NULL))
|
||||
if (W_CheckMultipleLumps("NTLINE", "NTLINEV","NTSP","NTWH", NULL))
|
||||
nametaggfx = true;
|
||||
}
|
||||
|
||||
|
||||
+11
-4
@@ -513,20 +513,26 @@ consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange,
|
||||
consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t nametagtrans_cons_t[] = {
|
||||
{0, "Never"}, {1, "Far only"}, {2, "Dynamic"}, {3, "Always"}, {0, NULL}};
|
||||
{0, "Never"}, {1, "Far only"}, {2, "Dynamic"}, {3, "Always"}, {4, "HUD Trans."}, {0, NULL}};
|
||||
/*static CV_PossibleValue_t nametagscaling_cons_t[] = {
|
||||
{0, "MIN"}, {320, "MAX"}, {0, NULL}};*/
|
||||
static CV_PossibleValue_t nametagdistance_cons_t[] = {
|
||||
{0, "MIN"}, {640, "MAX"}, {0, NULL}};
|
||||
consvar_t cv_nametag = {"kartnametag", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
static CV_PossibleValue_t nametagsize_cons_t[] = {
|
||||
{0, "Off"}, {1, "Small"}, {2, "Minimal"}, {0, NULL}};
|
||||
static CV_PossibleValue_t nametagrestat_cons_t[] = {
|
||||
{0, "Off"}, {1, "Restat"}, {2, "Always"}, {0, NULL}};
|
||||
|
||||
consvar_t cv_nametag = {"kartnametag", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagtrans = {"nametagtransparency", "Dynamic", CV_SAVE, nametagtrans_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagfacerank = {"nametagfacerank", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagfacerank = {"nametagfacerank", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagrestat = {"nametagrestat", "Restat", CV_SAVE, nametagrestat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagdist = {"nametagdist", "300", CV_SAVE, nametagdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagmaxplayers = {"nametagmaxplayers", "8", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagmaxlenght = {"nametagmaxlenght", "12", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
//consvar_t cv_nametagscaling = {"nametagscaling", "160", CV_SAVE, nametagscaling_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_showownnametag = {"showownnametag", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_smallnametags = {"smallnametags", "Off", CV_SAVE, CV_OnOff, Nametag_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_smallnametags = {"smallnametags", "Off", CV_SAVE, nametagsize_cons_t, Nametag_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t perfstats_cons_t[] = {
|
||||
{0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {4, "PreThinkFrame"}, {5, "PostThinkFrame"}, {0, NULL}};
|
||||
@@ -1093,6 +1099,7 @@ void D_RegisterClientCommands(void)
|
||||
CV_RegisterVar(&cv_nametagdist);
|
||||
CV_RegisterVar(&cv_showownnametag);
|
||||
CV_RegisterVar(&cv_smallnametags);
|
||||
CV_RegisterVar(&cv_nametagrestat);
|
||||
|
||||
|
||||
CV_RegisterVar(&cv_perfstats);
|
||||
|
||||
@@ -181,6 +181,7 @@ extern consvar_t cv_nametagmaxlenght;
|
||||
extern consvar_t cv_nametagdist;
|
||||
extern consvar_t cv_showownnametag;
|
||||
extern consvar_t cv_smallnametags;
|
||||
extern consvar_t cv_nametagrestat;
|
||||
|
||||
extern consvar_t cv_perfstats;
|
||||
extern consvar_t cv_ps_thinkframe_page;
|
||||
|
||||
+113
-114
@@ -7032,6 +7032,8 @@ static patch_t *kp_lapanim_hand[3];
|
||||
|
||||
static patch_t *nametagpic;
|
||||
static patch_t *nametagline;
|
||||
static patch_t *nametagspeed;
|
||||
static patch_t *nametagweight;
|
||||
|
||||
static patch_t *kp_yougotem;
|
||||
|
||||
@@ -7148,6 +7150,9 @@ void K_LoadKartHUDGraphics(void)
|
||||
if (nametaggfx){
|
||||
nametagpic = W_CachePatchName("NTLINE", PU_HUDGFX);
|
||||
nametagline = W_CachePatchName("NTLINEV", PU_HUDGFX);
|
||||
nametagspeed = W_CachePatchName("NTSP", PU_HUDGFX);
|
||||
nametagweight = W_CachePatchName("NTWH", PU_HUDGFX);
|
||||
|
||||
}
|
||||
|
||||
// Starting countdown
|
||||
@@ -8905,7 +8910,7 @@ static void K_GenerateNametagTextColormap(void)
|
||||
|
||||
//Shoutout to Lat for the ScreenCoords
|
||||
//With alot of edit because of god damn no-green-screen, fov, and render bullshit
|
||||
static void K_GetNameTagPos(vector2_t *vec, player_t player, camera_t camera, float mx, float my, float mz)
|
||||
static void K_GetNameTagPos(vector2_t *vec, player_t player, camera_t came, float mx, float my, float mz)
|
||||
{
|
||||
fixed_t camx, camy, camz, camangle, camaiming;
|
||||
fixed_t finalset;
|
||||
@@ -8924,12 +8929,12 @@ static void K_GetNameTagPos(vector2_t *vec, player_t player, camera_t camera, fl
|
||||
camangle = player.awayviewmobj->angle;
|
||||
camaiming = player.awayviewaiming;
|
||||
}
|
||||
else if (camera.chase) {
|
||||
camx = camera.x;
|
||||
camy = camera.y;
|
||||
camz = camera.z;
|
||||
camangle = camera.angle;
|
||||
camaiming = camera.aiming;
|
||||
else if (came.chase) {
|
||||
camx = came.x;
|
||||
camy = came.y;
|
||||
camz = came.z;
|
||||
camangle = came.angle;
|
||||
camaiming = came.aiming;
|
||||
}
|
||||
else {
|
||||
camx = player.mo->x;
|
||||
@@ -8971,27 +8976,15 @@ static void K_GetNameTagPos(vector2_t *vec, player_t player, camera_t camera, fl
|
||||
vec->x = x;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
fixed_t dist;
|
||||
UINT8 node;
|
||||
} sortarray;
|
||||
|
||||
static int nametagsort(const void* a, const void* b)
|
||||
{
|
||||
const sortarray *a2 = (const sortarray*)a;
|
||||
const sortarray *b2 = (const sortarray*)b;
|
||||
return (a2->dist - b2->dist);
|
||||
}
|
||||
|
||||
//Slighty fixed by Alug and further rewritten by NepDisk
|
||||
static void K_drawNameTags(void)
|
||||
{
|
||||
sortarray array[MAXPLAYERS];
|
||||
UINT8 i, j;
|
||||
UINT8 i;
|
||||
INT32 trans = 0;
|
||||
vector2_t pos;
|
||||
fixed_t st;
|
||||
int smol = 0;
|
||||
fixed_t posx,posy,pos2x,pos2y;
|
||||
|
||||
if (!stplyr->mo || stplyr->spectator || splitscreen)
|
||||
return;
|
||||
@@ -8999,50 +8992,33 @@ static void K_drawNameTags(void)
|
||||
if (!nametagtxtcm[MAXSKINCOLORS-1])
|
||||
K_GenerateNametagTextColormap();
|
||||
|
||||
if (leveltime < starttime)
|
||||
goto showownnametag;
|
||||
|
||||
if (cv_smallnametags.value)
|
||||
smol = (20<<FRACBITS);
|
||||
else
|
||||
smol = 0;
|
||||
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
{
|
||||
if (!players[i].mo || P_MobjWasRemoved(players[i].mo) || players[i].spectator || !playeringame[i] || i == displayplayers[0])
|
||||
continue;
|
||||
|
||||
//array[i].dist = P_AproxDistance(players[i].mo->x - (stplyr->mo->x + stplyr->mo->momx), players[i].mo->y - (stplyr->mo->y + stplyr->mo->momy));
|
||||
array[i].dist = R_PointToDist(players[i].mo->x, players[i].mo->y);
|
||||
array[i].node = i;
|
||||
}
|
||||
|
||||
// sort
|
||||
qsort(array, MAXPLAYERS, sizeof(sortarray), nametagsort);
|
||||
|
||||
for (j = MAXPLAYERS; j > 0; j--)
|
||||
{
|
||||
UINT8 *cm;
|
||||
UINT8 *textcm;
|
||||
fixed_t distance = 0;
|
||||
//fixed_t maxdistance = (cv_nametagdist.value*10)<<FRACBITS;
|
||||
fixed_t maxdistance = (10*cv_nametagdist.value)* mapobjectscale;
|
||||
angle_t an;
|
||||
|
||||
if ((j - MAXPLAYERS) > cv_nametagmaxplayers.value)
|
||||
if ((i - MAXPLAYERS) > cv_nametagmaxplayers.value)
|
||||
return;
|
||||
|
||||
i = array[j].node;
|
||||
|
||||
|
||||
if (i > PLAYERSMASK)
|
||||
continue;
|
||||
if (i == displayplayers[0])
|
||||
continue;
|
||||
if (!players[i].mo || P_MobjWasRemoved(players[i].mo) || players[i].spectator || !playeringame[i])
|
||||
continue;
|
||||
if (i == displayplayers[0] && !cv_showownnametag.value && !(leveltime < 130))
|
||||
continue;
|
||||
if (!(i == displayplayers[0]) && leveltime < starttime)
|
||||
continue;
|
||||
if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
|
||||
continue;
|
||||
distance = array[j].dist;
|
||||
distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
|
||||
if (distance > maxdistance)
|
||||
continue;
|
||||
an = R_PointToAngle2(camera[0].x, camera[0].y, players[i].mo->x, players[i].mo->y) - camera[0].angle;
|
||||
@@ -9080,6 +9056,9 @@ static void K_drawNameTags(void)
|
||||
trans = 0;
|
||||
break;
|
||||
case 3:
|
||||
trans = V_40TRANS;
|
||||
break;
|
||||
case 4:
|
||||
trans = V_HUDTRANS;
|
||||
break;
|
||||
default:
|
||||
@@ -9095,100 +9074,120 @@ static void K_drawNameTags(void)
|
||||
if (encoremode)
|
||||
pos.x = (320<<FRACBITS)-pos.x;
|
||||
|
||||
st = V_ThinStringWidth(player_names[i], V_ALLOWLOWERCASE);
|
||||
|
||||
if (players[i].mo->eflags & MFE_VERTICALFLIP && !(players[i].pflags & PF_FLIPCAM))
|
||||
st = cv_smallnametags.value ? V_SmallStringWidth(player_names[i], V_ALLOWLOWERCASE) : V_ThinStringWidth(player_names[i], V_ALLOWLOWERCASE);
|
||||
|
||||
if (cv_smallnametags.value == 2 || !nametaggfx)
|
||||
{
|
||||
if (cv_smallnametags.value || !nametaggfx)
|
||||
V_DrawSmallStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y+(13<<FRACBITS)+smol, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
if (players[i].mo->eflags & MFE_VERTICALFLIP && !(players[i].pflags & PF_FLIPCAM))
|
||||
posy = pos.y+(13<<FRACBITS)+smol;
|
||||
else
|
||||
posy = pos.y+smol;
|
||||
|
||||
posx = pos.x+(5<<FRACBITS);
|
||||
V_DrawSmallStringAtFixedCM(posx, posy, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
}
|
||||
else if (cv_smallnametags.value == 1)
|
||||
{
|
||||
if (players[i].mo->eflags & MFE_VERTICALFLIP && !(players[i].pflags & PF_FLIPCAM))
|
||||
{
|
||||
posy = pos.y+smol;
|
||||
pos2y = pos.y+(8<<FRACBITS)+smol;
|
||||
}
|
||||
else
|
||||
{
|
||||
V_DrawFixedPatch(pos.x, pos.y-(3<<FRACBITS), FRACUNIT, trans|V_FLIP, nametagline, cm);
|
||||
V_DrawThinStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y+(13<<FRACBITS), V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
posy = pos.y+(5<<FRACBITS)+smol;
|
||||
pos2y = pos.y+smol;
|
||||
}
|
||||
posx = pos.x;
|
||||
pos2x = pos.x+(2<<FRACBITS);
|
||||
V_DrawFixedPatch(posx, posy, FRACUNIT/2, trans, nametagline, cm);
|
||||
V_DrawSmallStringAtFixedCM(pos2x, pos2y, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (cv_smallnametags.value || !nametaggfx)
|
||||
V_DrawSmallStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y+smol, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
if (players[i].mo->eflags & MFE_VERTICALFLIP && !(players[i].pflags & PF_FLIPCAM))
|
||||
{
|
||||
|
||||
posy = pos.y-(3<<FRACBITS);
|
||||
pos2y = pos.y+(13<<FRACBITS);
|
||||
}
|
||||
else
|
||||
{
|
||||
V_DrawFixedPatch(pos.x, pos.y+(10<<FRACBITS), FRACUNIT, trans, nametagline, cm);
|
||||
V_DrawThinStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
posy = pos.y+(10<<FRACBITS);
|
||||
pos2y = pos.y;
|
||||
}
|
||||
posx = pos.x;
|
||||
pos2x = pos.x+(5<<FRACBITS);
|
||||
V_DrawFixedPatch(posx, posy, FRACUNIT, trans, nametagline, cm);
|
||||
V_DrawThinStringAtFixedCM(pos2x, pos2y, V_ALLOWLOWERCASE | trans, player_names[i], textcm);
|
||||
}
|
||||
|
||||
if ((!cv_smallnametags.value) && nametaggfx)
|
||||
if (nametaggfx)
|
||||
{
|
||||
if (cv_nametagfacerank.value)
|
||||
if ((!cv_smallnametags.value) && cv_nametagfacerank.value)
|
||||
{
|
||||
V_DrawStretchyFixedPatch(pos.x+(6<<FRACBITS), pos.y+(10<<FRACBITS),
|
||||
(st<<FRACBITS)+(15<<FRACBITS), FRACUNIT, trans, nametagpic, cm);
|
||||
if (stplyr->mo->eflags & MFE_VERTICALFLIP && !(stplyr->pflags & PF_FLIPCAM))
|
||||
V_DrawFixedPatch(pos.x+((st+8)<<FRACBITS),
|
||||
pos.y+(13<<FRACBITS), FRACUNIT, trans, facemmapprefix[players[i].skin], cm);
|
||||
else
|
||||
V_DrawFixedPatch(pos.x+((st+7)<<FRACBITS),
|
||||
pos.y, FRACUNIT, trans, facemmapprefix[players[i].skin], cm);
|
||||
if (players[i].mo->eflags & MFE_VERTICALFLIP && !(players[i].pflags & PF_FLIPCAM))
|
||||
{
|
||||
posx = pos.x+((st+8)<<FRACBITS);
|
||||
posy = pos.y+(13<<FRACBITS);
|
||||
}
|
||||
else
|
||||
{
|
||||
posx = pos.x+((st+7)<<FRACBITS);
|
||||
posy = pos.y;
|
||||
}
|
||||
V_DrawFixedPatch(posx,posy, FRACUNIT, trans, facemmapprefix[players[i].skin], cm);
|
||||
}
|
||||
else
|
||||
{
|
||||
V_DrawStretchyFixedPatch(pos.x+(6<<FRACBITS), pos.y+(10<<FRACBITS),
|
||||
st<<FRACBITS, FRACUNIT, trans, nametagpic, cm);
|
||||
if (!cv_smallnametags.value)
|
||||
V_DrawStretchyFixedPatch(pos.x+(6<<FRACBITS), pos.y+(10<<FRACBITS),
|
||||
st<<FRACBITS, FRACUNIT, trans, nametagpic, cm);
|
||||
else if (cv_smallnametags.value == 1)
|
||||
V_DrawStretchyFixedPatch(pos.x+(3<<FRACBITS), pos.y+(5<<FRACBITS)+smol,
|
||||
st<<FRACBITS, FRACUNIT/2, trans, nametagpic, cm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (cv_showownnametag.value)
|
||||
showownnametag:
|
||||
{
|
||||
UINT8 p = displayplayers[0];
|
||||
K_GetNameTagPos(&pos, *stplyr, camera[0], stplyr->mo->x, stplyr->mo->y, stplyr->mo->z + stplyr->mo->height);
|
||||
|
||||
pos.y -= stplyr->mo->height/2;
|
||||
|
||||
if (encoremode)
|
||||
pos.x = (320<<FRACBITS)-pos.x;
|
||||
|
||||
if (leveltime*4 < starttime)
|
||||
trans = V_60TRANS;
|
||||
else if (leveltime*3 < starttime)
|
||||
trans = V_40TRANS;
|
||||
else if (leveltime*2 < starttime)
|
||||
trans = V_20TRANS;
|
||||
else if (leveltime > starttime/2)
|
||||
trans = V_60TRANS;
|
||||
else if (leveltime > starttime/2.95)
|
||||
trans = V_40TRANS;
|
||||
else if (leveltime > starttime/1.8)
|
||||
trans = V_20TRANS;
|
||||
|
||||
UINT8 *cm = R_GetTranslationColormap(stplyr->skin, stplyr->mo->color, GTC_CACHE);
|
||||
|
||||
st = V_ThinStringWidth(player_names[p], V_ALLOWLOWERCASE);
|
||||
|
||||
if (cv_smallnametags.value || !nametaggfx)
|
||||
V_DrawSmallStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y+smol, V_ALLOWLOWERCASE | trans, player_names[p], nametagtxtcm[stplyr->mo->color]);
|
||||
if (cv_smallnametags.value == 1 || cv_smallnametags.value == 2)
|
||||
{
|
||||
if ((cv_nametagrestat.value == 1 && (players[i].kartspeed != skins[players[i].skin].kartspeed || players[i].kartweight != skins[players[i].skin].kartweight)) || cv_nametagrestat.value == 2)
|
||||
{
|
||||
if (cv_smallnametags.value == 1)
|
||||
{
|
||||
posx = pos.x+(2<<FRACBITS);
|
||||
pos2x = pos.x+(12<<FRACBITS);
|
||||
}
|
||||
else
|
||||
{
|
||||
posx = pos.x+(5<<FRACBITS);
|
||||
pos2x = pos.x+(15<<FRACBITS);
|
||||
|
||||
}
|
||||
|
||||
posy = pos.y-(5<<FRACBITS)+smol;
|
||||
V_DrawSmallStringAtFixedCM(posx, posy, trans, va("S%d ", players[i].kartspeed),nametagtxtcm[SKINCOLOR_BLUE]);
|
||||
V_DrawSmallStringAtFixedCM(pos2x, posy, trans, va("W%d ", players[i].kartweight),nametagtxtcm[SKINCOLOR_ORANGE]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
V_DrawFixedPatch(pos.x, pos.y+(10<<FRACBITS), FRACUNIT, trans, nametagline, cm);
|
||||
V_DrawThinStringAtFixedCM(pos.x+(5<<FRACBITS), pos.y, V_ALLOWLOWERCASE | trans, player_names[p], nametagtxtcm[stplyr->mo->color]);
|
||||
}
|
||||
|
||||
if ((!cv_smallnametags.value) && nametaggfx)
|
||||
{
|
||||
if (!cv_nametagfacerank.value)
|
||||
{
|
||||
|
||||
if ((cv_nametagrestat.value == 1 && (players[i].kartspeed != skins[players[i].skin].kartspeed || players[i].kartweight != skins[players[i].skin].kartweight)) || cv_nametagrestat.value == 2)
|
||||
{
|
||||
V_DrawStretchyFixedPatch(pos.x+(6<<FRACBITS), pos.y+(10<<FRACBITS),
|
||||
st<<FRACBITS, FRACUNIT, trans, nametagpic, cm);
|
||||
}
|
||||
else
|
||||
{
|
||||
V_DrawStretchyFixedPatch(pos.x+(6<<FRACBITS), pos.y+(10<<FRACBITS),
|
||||
(st<<FRACBITS)+(15<<FRACBITS), FRACUNIT, trans, nametagpic, cm);
|
||||
V_DrawFixedPatch(pos.x+((st+7)<<FRACBITS), pos.y, FRACUNIT, trans, facemmapprefix[stplyr->skin], cm);
|
||||
V_DrawStringAtFixedCM(pos.x+(13<<FRACBITS), pos.y-(10<<FRACBITS), trans, va("%d ", players[i].kartspeed),nametagtxtcm[SKINCOLOR_BLUE]);
|
||||
V_DrawStringAtFixedCM(pos.x+(33<<FRACBITS), pos.y-(10<<FRACBITS), trans, va("%d ", players[i].kartweight),nametagtxtcm[SKINCOLOR_ORANGE]);
|
||||
if (nametaggfx)
|
||||
{
|
||||
V_DrawFixedPatch(pos.x+(4<<FRACBITS), pos.y-(11<<FRACBITS), FRACUNIT, trans, nametagspeed, cm);
|
||||
V_DrawFixedPatch(pos.x+(24<<FRACBITS), pos.y-(11<<FRACBITS), FRACUNIT, trans, nametagweight, cm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-1
@@ -2323,10 +2323,24 @@ static menuitem_t OP_NametagMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Max distance", &cv_nametagdist, 40},
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Max Display Players", &cv_nametagmaxplayers, 50},
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Transparency", &cv_nametagtrans, 60},
|
||||
{IT_STRING | IT_CVAR, NULL, "Small Nametags", &cv_smallnametags, 70},
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Restat", &cv_nametagrestat, 70},
|
||||
{IT_STRING | IT_CVAR, NULL, "Small Nametags", &cv_smallnametags, 80},
|
||||
//{IT_STRING | IT_CVAR, NULL, "Nametag Scaling", &cv_nametagscaling, 70}
|
||||
};
|
||||
|
||||
static const char* OP_NametagTooltips[] =
|
||||
{
|
||||
NULL,
|
||||
"Enable nametags in game.",
|
||||
"Show character icon in nametag.",
|
||||
"Show your own nametag in game.",
|
||||
"Distance nametags are visible.",
|
||||
"Maximum amount of nametags on screen.",
|
||||
"Transparency of nametags.",
|
||||
"Show stats in nametags.",
|
||||
"Alternative smaller nametags.",
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
nt_header,
|
||||
@@ -2336,9 +2350,12 @@ enum
|
||||
nt_maxdist,
|
||||
nt_maxplayer,
|
||||
nt_nttrans,
|
||||
nt_ntrestat,
|
||||
nt_smol,
|
||||
};
|
||||
|
||||
|
||||
|
||||
static menuitem_t OP_TiltMenu[] =
|
||||
{
|
||||
{IT_STRING | IT_CVAR, NULL, "Camera Tilting", &cv_tilting, 0},
|
||||
@@ -5239,6 +5256,16 @@ static void M_DrawGenericMenu(void)
|
||||
coolalphatimer--;
|
||||
}
|
||||
}
|
||||
|
||||
if (currentMenu == &OP_NametagDef)
|
||||
{
|
||||
if (!(OP_NametagTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
coolalphatimer--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void M_DrawGenericBackgroundMenu(void)
|
||||
|
||||
@@ -2183,6 +2183,97 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
|
||||
}
|
||||
}
|
||||
|
||||
// Draws a string at a fixed_t location.
|
||||
void V_DrawStringAtFixedCM(fixed_t x, fixed_t y, INT32 option, const char *string, UINT8* colormap)
|
||||
{
|
||||
fixed_t cx = x, cy = y;
|
||||
INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
|
||||
const char *ch = string;
|
||||
INT32 spacewidth = 4, charwidth = 0;
|
||||
|
||||
INT32 lowercase = (option & V_ALLOWLOWERCASE);
|
||||
option &= ~V_FLIP; // which is also shared with V_ALLOWLOWERCASE...
|
||||
|
||||
if (option & V_NOSCALESTART)
|
||||
{
|
||||
dupx = vid.dupx;
|
||||
dupy = vid.dupy;
|
||||
scrwidth = vid.width;
|
||||
}
|
||||
else
|
||||
{
|
||||
dupx = dupy = 1;
|
||||
scrwidth = vid.width/vid.dupx;
|
||||
left = (scrwidth - BASEVIDWIDTH)/2;
|
||||
scrwidth -= left;
|
||||
}
|
||||
|
||||
switch (option & V_SPACINGMASK)
|
||||
{
|
||||
case V_MONOSPACE:
|
||||
spacewidth = 8;
|
||||
/* FALLTHRU */
|
||||
case V_OLDSPACING:
|
||||
charwidth = 8;
|
||||
break;
|
||||
case V_6WIDTHSPACE:
|
||||
spacewidth = 6;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
for (;;ch++)
|
||||
{
|
||||
if (!*ch)
|
||||
break;
|
||||
if (*ch & 0x80) //color ignoring
|
||||
continue;
|
||||
if (*ch == '\n')
|
||||
{
|
||||
cx = x;
|
||||
|
||||
if (option & V_RETURN8)
|
||||
cy += (8*dupy)<<FRACBITS;
|
||||
else
|
||||
cy += (12*dupy)<<FRACBITS;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
c = *ch;
|
||||
if (!lowercase)
|
||||
c = toupper(c);
|
||||
c -= HU_FONTSTART;
|
||||
|
||||
// character does not exist or is a space
|
||||
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
|
||||
{
|
||||
cx += (spacewidth * dupx)<<FRACBITS;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (charwidth)
|
||||
{
|
||||
w = charwidth * dupx;
|
||||
center = w/2 - SHORT(hu_font[c]->width)*(dupx/2);
|
||||
}
|
||||
else
|
||||
w = SHORT(hu_font[c]->width) * dupx;
|
||||
|
||||
if ((cx>>FRACBITS) > scrwidth)
|
||||
break;
|
||||
if ((cx>>FRACBITS)+left + w < 0) //left boundary check
|
||||
{
|
||||
cx += w<<FRACBITS;
|
||||
continue;
|
||||
}
|
||||
|
||||
V_DrawFixedPatch(cx + (center<<FRACBITS), cy, FRACUNIT, option, hu_font[c], colormap);
|
||||
|
||||
cx += w<<FRACBITS;
|
||||
}
|
||||
}
|
||||
|
||||
// Jaden: awesome!
|
||||
void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
|
||||
{
|
||||
|
||||
@@ -204,6 +204,7 @@ void V_DrawCenteredThinString(INT32 x, INT32 y, INT32 option, const char *string
|
||||
void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *string);
|
||||
|
||||
void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
|
||||
void V_DrawStringAtFixedCM(fixed_t x, fixed_t y, INT32 option, const char *string, UINT8* colormap);
|
||||
|
||||
void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
|
||||
void V_DrawCenteredSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
|
||||
|
||||
Reference in new issue
Block a user