thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove "circuitmap"

Browse source 
An effectively useless global scope boolean that literally checks for the presence of a finish line, created in and used only by things we inherited from vanilla SRB2
This commit is contained in:
toaster 2022-12-31 23:27:59 +00:00
parent 84b066245e
commit 42a6b03e48
8 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_netcmd.c
View file

@ -553,7 +553,6 @@ INT16 numgametypes = GT_FIRSTFREESLOT;
boolean forceresetplayers = false; boolean forceresetplayers = false;
boolean deferencoremode = false; boolean deferencoremode = false;
UINT8 splitscreen = 0; UINT8 splitscreen = 0;
boolean circuitmap = false;
INT32 adminplayers[MAXPLAYERS]; INT32 adminplayers[MAXPLAYERS];
// Scheduled commands. // Scheduled commands.

1
src/doomstat.h
View file

@ -150,7 +150,6 @@ extern boolean multiplayer;
extern UINT8 splitscreen; extern UINT8 splitscreen;
extern int r_splitscreen; extern int r_splitscreen;
extern boolean circuitmap; // Does this level have 'circuit mode'?
extern boolean fromlevelselect; extern boolean fromlevelselect;
extern boolean forceresetplayers, deferencoremode; extern boolean forceresetplayers, deferencoremode;

14
src/hu_stuff.c
View file

@ -2457,11 +2457,8 @@ static void HU_DrawRankings(void)
} }
else if (gametyperules & GTR_CIRCUIT) else if (gametyperules & GTR_CIRCUIT)
{ {
if (circuitmap) V_DrawCenteredString(64, 8, 0, "LAPS");
{ V_DrawCenteredString(64, 16, hilicol, va("%d", numlaps));
V_DrawCenteredString(64, 8, 0, "LAP COUNT");
V_DrawCenteredString(64, 16, hilicol, va("%d", numlaps));
}
} }
// Right hand side // Right hand side
@ -2548,13 +2545,12 @@ static void HU_DrawRankings(void)
if ((gametyperules & GTR_CIRCUIT)) if ((gametyperules & GTR_CIRCUIT))
{ {
if (circuitmap) tab[scorelines].count = players[i].laps;
tab[scorelines].count = players[i].laps;
else
tab[scorelines].count = players[i].realtime;
} }
else else
{
tab[scorelines].count = players[i].roundscore; tab[scorelines].count = players[i].roundscore;
}
scorelines++; scorelines++;

4
src/k_hud.c
View file

@ -2304,7 +2304,7 @@ void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, IN
V_DrawRightAlignedThinString(x+rightoffset, y-1, hilicol|V_6WIDTHSPACE, timestring(players[tab[i].num].realtime)); V_DrawRightAlignedThinString(x+rightoffset, y-1, hilicol|V_6WIDTHSPACE, timestring(players[tab[i].num].realtime));
else if (players[tab[i].num].pflags & PF_NOCONTEST) else if (players[tab[i].num].pflags & PF_NOCONTEST)
V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, "NO CONTEST."); V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, "NO CONTEST.");
else if (circuitmap) else
V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, va("Lap %d", tab[i].count)); V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, va("Lap %d", tab[i].count));
} }
else else
@ -2313,7 +2313,7 @@ void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, IN
V_DrawRightAlignedString(x+rightoffset, y, hilicol, timestring(players[tab[i].num].realtime)); V_DrawRightAlignedString(x+rightoffset, y, hilicol, timestring(players[tab[i].num].realtime));
else if (players[tab[i].num].pflags & PF_NOCONTEST) else if (players[tab[i].num].pflags & PF_NOCONTEST)
V_DrawRightAlignedThinString(x+rightoffset, y-1, 0, "NO CONTEST."); V_DrawRightAlignedThinString(x+rightoffset, y-1, 0, "NO CONTEST.");
else if (circuitmap) else
V_DrawRightAlignedString(x+rightoffset, y, 0, va("Lap %d", tab[i].count)); V_DrawRightAlignedString(x+rightoffset, y, 0, va("Lap %d", tab[i].count));
} }
#undef timestring #undef timestring

3
src/lua_script.c
View file

@ -162,9 +162,6 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word,"maptol")) { } else if (fastcmp(word,"maptol")) {
lua_pushinteger(L, maptol); lua_pushinteger(L, maptol);
return 1; return 1;
} else if (fastcmp(word,"circuitmap")) {
lua_pushboolean(L, circuitmap);
return 1;
} else if (fastcmp(word,"stoppedclock")) { } else if (fastcmp(word,"stoppedclock")) {
lua_pushboolean(L, stoppedclock); lua_pushboolean(L, stoppedclock);
return 1; return 1;

1
src/p_setup.c
View file

@ -6822,7 +6822,6 @@ static void P_InitLevelSettings(void)
rflagpoint = bflagpoint = NULL; rflagpoint = bflagpoint = NULL;
// circuit, race and competition stuff // circuit, race and competition stuff
circuitmap = false;
numstarposts = 0; numstarposts = 0;
timeinmap = 0; timeinmap = 0;

6
src/p_spec.c
View file

@ -6671,12 +6671,6 @@ void P_SpawnSpecials(boolean fromnetsave)
break; break;
} }
// SRB2Kart
case 2001: // Finish Line
if ((gametyperules & GTR_CIRCUIT))
circuitmap = true;
break;
default: default:
break; break;
} }

4
src/p_user.c
View file

@ -2639,7 +2639,7 @@ static void P_DeathThink(player_t *player)
player->realtime = leveltime - starttime; player->realtime = leveltime - starttime;
if (player == &players[consoleplayer]) if (player == &players[consoleplayer])
{ {
if (player->spectator || !circuitmap) if (player->spectator)
curlap = 0; curlap = 0;
else if (curlap != UINT32_MAX) else if (curlap != UINT32_MAX)
curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V
@ -3998,7 +3998,7 @@ void P_PlayerThink(player_t *player)
player->realtime = leveltime - starttime; player->realtime = leveltime - starttime;
if (player == &players[consoleplayer]) if (player == &players[consoleplayer])
{ {
if (player->spectator || !circuitmap) if (player->spectator)
curlap = 0; curlap = 0;
else if (curlap != UINT32_MAX) else if (curlap != UINT32_MAX)
curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V