Merge branch 'nametags' into driftgauge
This commit is contained in:
commit
f87c5e2e8d
4 files changed
+9
-4
No files matched your search
@@ -538,6 +538,7 @@ consvar_t cv_showownnametag = {"kartnametagshowown", "Off", CV_SAVE, CV_OnOff, N
|
||||
consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametaghop = {"kartnametaghop", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_nametagscore = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_shownametagfinish = {"kartshownametagfinished", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t driftgaugeoffset_cons_t[] = {
|
||||
{-FRACUNIT*128, "MIN"}, {FRACUNIT*128, "MAX"}, {0, NULL}};
|
||||
@@ -1153,6 +1154,7 @@ void D_RegisterClientCommands(void)
|
||||
CV_RegisterVar(&cv_nametagrestat);
|
||||
CV_RegisterVar(&cv_nametaghop);
|
||||
CV_RegisterVar(&cv_nametagscore);
|
||||
CV_RegisterVar(&cv_shownametagfinish);
|
||||
|
||||
CV_RegisterVar(&cv_driftgauge);
|
||||
CV_RegisterVar(&cv_driftgaugeofs);
|
||||
|
||||
@@ -185,6 +185,7 @@ extern consvar_t cv_smallnametags;
|
||||
extern consvar_t cv_nametagrestat;
|
||||
extern consvar_t cv_nametaghop;
|
||||
extern consvar_t cv_nametagscore;
|
||||
extern consvar_t cv_shownametagfinish;
|
||||
|
||||
#define SKINSELECTSPIN_PAIN 25
|
||||
extern consvar_t cv_skinselectspin;
|
||||
|
||||
+3
-3
@@ -9072,7 +9072,7 @@ static void K_drawNameTags(void)
|
||||
patch_t *icon;
|
||||
INT32 hudtransflag = V_LocalTransFlag();
|
||||
|
||||
if (!stplyr->mo || stplyr->spectator || splitscreen)
|
||||
if (!stplyr->mo || stplyr->spectator || splitscreen || (stplyr->exiting && !cv_shownametagfinish.value))
|
||||
return;
|
||||
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
@@ -9139,7 +9139,7 @@ static void K_drawNameTags(void)
|
||||
//Check for negative screencoords
|
||||
if (pos.x == -1 || pos.y == -1)
|
||||
continue;
|
||||
|
||||
|
||||
tagsdisplayed += 1;
|
||||
|
||||
if (tagsdisplayed > cv_nametagmaxplayers.value)
|
||||
@@ -9253,7 +9253,7 @@ static void K_drawNameTags(void)
|
||||
}
|
||||
|
||||
if (cv_nametagfacerank.value)
|
||||
{
|
||||
{
|
||||
V_DrawMappedPatch(namex, namey - dup*(icon->height+1), vflags, icon, cm);
|
||||
namex += dup*(icon->height+1); // add offset to other stuff
|
||||
}
|
||||
|
||||
+3
-1
@@ -367,7 +367,6 @@ menu_t OP_AdvancedBirdDef;
|
||||
|
||||
// Chaotic
|
||||
menu_t OP_NametagDef;
|
||||
//menu_t OP_OGLShadowsDef;
|
||||
|
||||
//Driftgauge
|
||||
menu_t OP_DriftGaugeDef;
|
||||
@@ -2234,6 +2233,7 @@ static menuitem_t OP_NametagMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Restat", &cv_nametagrestat, 80},
|
||||
{IT_STRING | IT_CVAR, NULL, "Nametag Hop", &cv_nametaghop, 90},
|
||||
{IT_STRING | IT_CVAR, NULL, "Small Nametags", &cv_smallnametags, 100},
|
||||
{IT_STRING | IT_CVAR, NULL, "Show Nametags after Race finish", &cv_shownametagfinish, 110},
|
||||
//{IT_STRING | IT_CVAR, NULL, "Nametag Scaling", &cv_nametagscaling, 70}
|
||||
};
|
||||
|
||||
@@ -2251,6 +2251,7 @@ static const char* OP_NametagTooltips[] =
|
||||
"Show stats in nametags.",
|
||||
"Enable Saltyhop support for nametags.",
|
||||
"Alternative smaller nametags.",
|
||||
"Toggles being able to see Nametags after finishing a race.",
|
||||
};
|
||||
|
||||
enum
|
||||
@@ -2266,6 +2267,7 @@ enum
|
||||
nt_ntrestat,
|
||||
nt_nthop,
|
||||
nt_smol,
|
||||
nt_finish,
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user