stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-04-01 16:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

More UI crap!

Browse source 
* Fix minor additional error in tab rankings.
* Remove FREE PLAY from intermission drawer, per Sal's request.
* Remove "second%s" from the end of the "Start in %d"/"Vote ends in %d" string.
* Rename cv_advancemap's "Off" value to "Same", to make the behaviour clearer.
* Make the "Start in %d" string now begin with cv_advancemap's string (ie, "Vote in %d", "Same in %d", "Random in %d, Next in %d"...
This commit is contained in:
toaster 2018-07-30 23:17:01 +01:00
parent 057bc41203
commit 731b05e263
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -432,7 +432,7 @@ consvar_t cv_maxping = {"maxping", "0", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NUL
static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
consvar_t cv_inttime = {"inttime", "20", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {3, "Vote"}, {0, NULL}};
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Same"}, {1, "Next"}, {2, "Random"}, {3, "Vote"}, {0, NULL}};
consvar_t cv_advancemap = {"advancemap", "Vote", CV_NETVAR, advancemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t playersforexit_cons_t[] = {{0, "One"}, {1, "All"}, {0, NULL}};
consvar_t cv_playersforexit = {"playersforexit", "One", CV_NETVAR, playersforexit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

2
src/hu_stuff.c
View file

@ -1376,7 +1376,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
#undef timestring
}
else
V_DrawRightAlignedString(x+rightoffset, y, ((players[tab[i].num].health > 0) ? 0 : V_60TRANS), va("%u", tab[i].count));
V_DrawRightAlignedString(x+rightoffset, y, 0, va("%u", tab[i].count));
y += 16;
if (i == 9)

2
src/m_menu.c
View file

@ -1436,7 +1436,7 @@ static menuitem_t OP_ServerOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Intermission Timer", &cv_inttime, 40},
{IT_STRING | IT_CVAR, NULL, "Voting Timer", &cv_votetime, 50},
{IT_STRING | IT_CVAR, NULL, "Advance to Next Level", &cv_advancemap, 60},
{IT_STRING | IT_CVAR, NULL, "Advance to Next Level", &cv_advancemap, 60},
#ifndef NONET
{IT_STRING | IT_CVAR, NULL, "Max Player Count", &cv_maxplayers, 80},

13
src/y_inter.c
View file

@ -263,7 +263,6 @@ static void Y_CalculateMatchData(boolean rankingsmode, void (*comparison)(INT32)
//
void Y_IntermissionDrawer(void)
{
boolean forcefreeplay = false;
INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = V_YELLOWMAP; // fallback
if (intertype == int_none || rendermode == render_none)
@ -370,11 +369,7 @@ void Y_IntermissionDrawer(void)
if (data.match.rankingsmode)
timeheader = "RANK";
else
{
timeheader = (intertype == int_race ? "TIME" : "SCORE");
if (data.match.numplayers <= 1)
forcefreeplay = true;
}
// draw the level name
V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 20, 0, data.match.levelstring);
@ -492,15 +487,11 @@ void Y_IntermissionDrawer(void)
}
dotimer:
if (netgame && forcefreeplay) // FREE PLAY?
K_drawKartFreePlay(intertic);
if (timer)
{
INT32 tickdown = (timer+1)/TICRATE;
V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol,
va("start in %d second%s", tickdown, (tickdown == 1 ? "" : "s")));
va("%s in %d", cv_advancemap.string, tickdown));
}
// Make it obvious that scrambling is happening next round.
@ -1139,7 +1130,7 @@ void Y_VoteDrawer(void)
else //if (gametype == GT_MATCH)
hilicol = V_REDMAP;
V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol,
va("Vote ends in %d second%s", tickdown, (tickdown == 1 ? "" : "s")));
va("Vote ends in %d", tickdown));
}
}