From 08f9628e6c7b391b9dcfeffca08354b4ea09e457 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 1 Oct 2022 16:57:40 -0700 Subject: [PATCH 1/3] Remove kartminimap, kartcheck, kartcomeback cvars --- src/d_netcmd.c | 23 ----------------------- src/d_netcmd.h | 3 --- src/doomstat.h | 1 - src/g_game.c | 1 - src/k_hud.c | 14 +++++--------- src/k_kart.c | 5 +---- src/k_menudef.c | 9 --------- src/lua_hudlib.c | 2 +- src/lua_script.c | 3 --- src/p_saveg.c | 2 -- src/p_setup.c | 4 ---- 11 files changed, 7 insertions(+), 60 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 435cc5b6f..c062bdc57 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -142,7 +142,6 @@ static void SoundTest_OnChange(void); static void KartFrantic_OnChange(void); static void KartSpeed_OnChange(void); static void KartEncore_OnChange(void); -static void KartComeback_OnChange(void); static void KartEliminateLast_OnChange(void); static void Schedule_OnChange(void); @@ -392,14 +391,10 @@ consvar_t cv_tripleorbinaut = CVAR_INIT ("tripleorbinaut", "On", CV_NETVAR, C consvar_t cv_quadorbinaut = CVAR_INIT ("quadorbinaut", "On", CV_NETVAR, CV_OnOff, NULL); consvar_t cv_dualjawz = CVAR_INIT ("dualjawz", "On", CV_NETVAR, CV_OnOff, NULL); -static CV_PossibleValue_t kartminimap_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}}; -consvar_t cv_kartminimap = CVAR_INIT ("kartminimap", "4", CV_SAVE, kartminimap_cons_t, NULL); -consvar_t cv_kartcheck = CVAR_INIT ("kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL); consvar_t cv_kartspeed = CVAR_INIT ("kartspeed", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange); static CV_PossibleValue_t kartbumpers_cons_t[] = {{1, "MIN"}, {12, "MAX"}, {0, NULL}}; consvar_t cv_kartbumpers = CVAR_INIT ("kartbumpers", "3", CV_NETVAR, kartbumpers_cons_t, NULL); consvar_t cv_kartfrantic = CVAR_INIT ("kartfrantic", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartFrantic_OnChange); -consvar_t cv_kartcomeback = CVAR_INIT ("kartcomeback", "On", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartComeback_OnChange); static CV_PossibleValue_t kartencore_cons_t[] = {{-1, "Auto"}, {0, "Off"}, {1, "On"}, {0, NULL}}; consvar_t cv_kartencore = CVAR_INIT ("kartencore", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartencore_cons_t, KartEncore_OnChange); static CV_PossibleValue_t kartvoterulechanges_cons_t[] = {{0, "Never"}, {1, "Sometimes"}, {2, "Frequent"}, {3, "Always"}, {0, NULL}}; @@ -6628,24 +6623,6 @@ static void KartEncore_OnChange(void) CONS_Printf(M_GetText("Encore Mode will be set to %s next round.\n"), cv_kartencore.string); } -static void KartComeback_OnChange(void) -{ - if (K_CanChangeRules() == false) - { - return; - } - - if (leveltime < starttime) - { - CONS_Printf(M_GetText("Karma Comeback has been turned %s.\n"), cv_kartcomeback.value ? M_GetText("on") : M_GetText("off")); - comeback = (boolean)cv_kartcomeback.value; - } - else - { - CONS_Printf(M_GetText("Karma Comeback will be turned %s next round.\n"), cv_kartcomeback.value ? M_GetText("on") : M_GetText("off")); - } -} - static void KartEliminateLast_OnChange(void) { if (K_CanChangeRules() == false) diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 2f2b2a25b..f045b1121 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -105,12 +105,9 @@ extern consvar_t cv_quadorbinaut, cv_dualjawz; -extern consvar_t cv_kartminimap; -extern consvar_t cv_kartcheck; extern consvar_t cv_kartspeed; extern consvar_t cv_kartbumpers; extern consvar_t cv_kartfrantic; -extern consvar_t cv_kartcomeback; extern consvar_t cv_kartencore; extern consvar_t cv_kartvoterulechanges; extern consvar_t cv_kartgametypepreference; diff --git a/src/doomstat.h b/src/doomstat.h index dc6370ece..216a76038 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -659,7 +659,6 @@ extern UINT8 numlaps; extern UINT8 gamespeed; extern boolean franticitems; extern boolean encoremode, prevencoremode; -extern boolean comeback; extern SINT8 battlewanted[4]; extern tic_t wantedcalcdelay; diff --git a/src/g_game.c b/src/g_game.c index 3dfac9246..e4be3962e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -296,7 +296,6 @@ UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0 for e boolean encoremode = false; // Encore Mode currently enabled? boolean prevencoremode; boolean franticitems; // Frantic items currently enabled? -boolean comeback; // Battle Mode's karma comeback is on/off // Voting system INT16 votelevels[4][2]; // Levels that were rolled by the host diff --git a/src/k_hud.c b/src/k_hud.c index 6b4703d2b..474661a7f 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3329,7 +3329,7 @@ static void K_drawKartMinimap(void) patch_t *AutomapPic; INT32 i = 0; INT32 x, y; - INT32 minimaptrans = cv_kartminimap.value; + INT32 minimaptrans = 4; INT32 splitflags = 0; UINT8 skin = 0; UINT8 *colormap = NULL; @@ -3945,7 +3945,7 @@ static void K_drawBattleFullscreen(void) else K_drawKartFinish(); } - else if (stplyr->bumpers <= 0 && stplyr->karmadelay && comeback && !stplyr->spectator && drawcomebacktimer) + else if (stplyr->bumpers <= 0 && stplyr->karmadelay && !stplyr->spectator && drawcomebacktimer) { UINT16 t = stplyr->karmadelay/(10*TICRATE); INT32 txoff, adjust = (r_splitscreen > 1) ? 4 : 6; // normal string is 8, kart string is 12, half of that for ease @@ -4604,14 +4604,13 @@ void K_drawKartHUD(void) || (stplyr->bumpers <= 0 && stplyr->karmadelay > 0 && !(stplyr->pflags & PF_ELIMINATED) - && comeback == true && stplyr->playerstate == PST_LIVE))); if (!demo.title && (!battlefullscreen || r_splitscreen)) { // Draw the CHECK indicator before the other items, so it's overlapped by everything else if (LUA_HudEnabled(hud_check)) // delete lua when? - if (cv_kartcheck.value && !splitscreen && !players[displayplayers[0]].exiting && !freecam) + if (!splitscreen && !players[displayplayers[0]].exiting && !freecam) K_drawKartPlayerCheck(); // nametags @@ -4625,11 +4624,8 @@ void K_drawKartHUD(void) K_drawKartWanted(); } - if (cv_kartminimap.value) - { - if (LUA_HudEnabled(hud_minimap)) - K_drawKartMinimap(); - } + if (LUA_HudEnabled(hud_minimap)) + K_drawKartMinimap(); } if (battlefullscreen && !freecam) diff --git a/src/k_kart.c b/src/k_kart.c index c7559d558..ad7818bf9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -240,12 +240,9 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_quadorbinaut); CV_RegisterVar(&cv_dualjawz); - CV_RegisterVar(&cv_kartminimap); - CV_RegisterVar(&cv_kartcheck); CV_RegisterVar(&cv_kartspeed); CV_RegisterVar(&cv_kartbumpers); CV_RegisterVar(&cv_kartfrantic); - CV_RegisterVar(&cv_kartcomeback); CV_RegisterVar(&cv_kartencore); CV_RegisterVar(&cv_kartvoterulechanges); CV_RegisterVar(&cv_kartgametypepreference); @@ -8231,7 +8228,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->spheres < 0) player->spheres = 0; - if (comeback == false || !(gametyperules & GTR_KARMA) || (player->pflags & PF_ELIMINATED)) + if (!(gametyperules & GTR_KARMA) || (player->pflags & PF_ELIMINATED)) { player->karmadelay = comebacktime; } diff --git a/src/k_menudef.c b/src/k_menudef.c index 126bf3f21..66be81efb 100644 --- a/src/k_menudef.c +++ b/src/k_menudef.c @@ -911,15 +911,9 @@ menuitem_t OPTIONS_HUD[] = {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, "Minimap Opacity", "Changes the opacity of the minimap.", - NULL, {.cvar = &cv_kartminimap}, 0, 0}, - {IT_STRING | IT_CVAR, "Speedometer", "Choose to what speed unit to display or toggle off the speedometer.", NULL, {.cvar = &cv_kartspeedometer}, 0, 0}, - {IT_STRING | IT_CVAR, "Display \"CHECK\"", "Displays an icon when a player is tailing you.", - NULL, {.cvar = &cv_kartcheck}, 0, 0}, - {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, @@ -1033,9 +1027,6 @@ menuitem_t OPTIONS_Gameplay[] = {IT_STRING | IT_CVAR, "Starting Bumpers", "Change how many bumpers player start with in Battle.", NULL, {.cvar = &cv_kartbumpers}, 0, 0}, - {IT_STRING | IT_CVAR, "Karma Comeback", "Enable Karma Comeback in Battle mode.", - NULL, {.cvar = &cv_kartcomeback}, 0, 0}, - {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index ffacf34c5..cb81e2e73 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -641,7 +641,7 @@ static int libd_drawOnMinimap(lua_State *L) if (!lt_exitticker) return 0; - minimaptrans = cv_kartminimap.value; + minimaptrans = 4; if (lt_exitticker < length) minimaptrans = (((INT32)lt_exitticker)*minimaptrans)/((INT32)length); if (!minimaptrans) diff --git a/src/lua_script.c b/src/lua_script.c index f8fc119fd..eaacbf145 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -351,9 +351,6 @@ int LUA_PushGlobals(lua_State *L, const char *word) } else if (fastcmp(word,"franticitems")) { lua_pushboolean(L, franticitems); return 1; - } else if (fastcmp(word,"comeback")) { - lua_pushboolean(L, comeback); - return 1; } else if (fastcmp(word,"wantedcalcdelay")) { lua_pushinteger(L, wantedcalcdelay); return 1; diff --git a/src/p_saveg.c b/src/p_saveg.c index 3ae89befb..85e5dc1d9 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -4565,7 +4565,6 @@ static void P_NetArchiveMisc(boolean resending) WRITEUINT8(save_p, gamespeed); WRITEUINT8(save_p, numlaps); WRITEUINT8(save_p, franticitems); - WRITEUINT8(save_p, comeback); WRITESINT8(save_p, speedscramble); WRITESINT8(save_p, encorescramble); @@ -4724,7 +4723,6 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading) gamespeed = READUINT8(save_p); numlaps = READUINT8(save_p); franticitems = (boolean)READUINT8(save_p); - comeback = (boolean)READUINT8(save_p); speedscramble = READSINT8(save_p); encorescramble = READSINT8(save_p); diff --git a/src/p_setup.c b/src/p_setup.c index a4f21ee76..f2951b182 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3575,20 +3575,17 @@ static void P_InitLevelSettings(void) } franticitems = false; - comeback = true; } else if (bossinfo.boss) { gamespeed = KARTSPEED_EASY; franticitems = false; - comeback = true; } else if (modeattacking) { // Just play it safe and set everything gamespeed = KARTSPEED_HARD; franticitems = false; - comeback = true; } else { @@ -3602,7 +3599,6 @@ static void P_InitLevelSettings(void) gamespeed = (UINT8)cv_kartspeed.value; } franticitems = (boolean)cv_kartfrantic.value; - comeback = (boolean)cv_kartcomeback.value; } for (i = 0; i < 4; i++) From c935c42bd1249f70e04e59928524723a708eb0b4 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 1 Oct 2022 17:17:20 -0700 Subject: [PATCH 2/3] Rename "kart" prefixed cvars kartspeed -> gamespeed kartbumpers -> battlebumpers kartfrantic -> franticitems kartdisplayspeed -> speedometer kartvoices -> tauntvoices kartbot -> bots kartdebugdistribution -> debugitemodds kartdebughuddrop -> debugitemdrop kartencore -> encore kartvoterulechanges -> voterulechanges kartgametypepreference -> gametypepreference karteliminatelast -> eliminatelast kartusepwrlv -> usepwrlv kartdebugitem -> debugitem kartdebugamount -> debugitemamount kartdebugwaypoints -> debugwaypoints kartdebugbotpredict -> debugbotpredict kartdebugnodes -> debugnodes kartdebugcolorize -> debugcolorize kartdebugdirector -> debugdirector --- src/d_netcmd.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c062bdc57..678b36fc7 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -391,20 +391,20 @@ consvar_t cv_tripleorbinaut = CVAR_INIT ("tripleorbinaut", "On", CV_NETVAR, C consvar_t cv_quadorbinaut = CVAR_INIT ("quadorbinaut", "On", CV_NETVAR, CV_OnOff, NULL); consvar_t cv_dualjawz = CVAR_INIT ("dualjawz", "On", CV_NETVAR, CV_OnOff, NULL); -consvar_t cv_kartspeed = CVAR_INIT ("kartspeed", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange); +consvar_t cv_kartspeed = CVAR_INIT ("gamespeed", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange); static CV_PossibleValue_t kartbumpers_cons_t[] = {{1, "MIN"}, {12, "MAX"}, {0, NULL}}; -consvar_t cv_kartbumpers = CVAR_INIT ("kartbumpers", "3", CV_NETVAR, kartbumpers_cons_t, NULL); -consvar_t cv_kartfrantic = CVAR_INIT ("kartfrantic", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartFrantic_OnChange); +consvar_t cv_kartbumpers = CVAR_INIT ("battlebumpers", "3", CV_NETVAR, kartbumpers_cons_t, NULL); +consvar_t cv_kartfrantic = CVAR_INIT ("franticitems", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartFrantic_OnChange); static CV_PossibleValue_t kartencore_cons_t[] = {{-1, "Auto"}, {0, "Off"}, {1, "On"}, {0, NULL}}; -consvar_t cv_kartencore = CVAR_INIT ("kartencore", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartencore_cons_t, KartEncore_OnChange); +consvar_t cv_kartencore = CVAR_INIT ("encore", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartencore_cons_t, KartEncore_OnChange); static CV_PossibleValue_t kartvoterulechanges_cons_t[] = {{0, "Never"}, {1, "Sometimes"}, {2, "Frequent"}, {3, "Always"}, {0, NULL}}; -consvar_t cv_kartvoterulechanges = CVAR_INIT ("kartvoterulechanges", "Frequent", CV_NETVAR, kartvoterulechanges_cons_t, NULL); +consvar_t cv_kartvoterulechanges = CVAR_INIT ("voterulechanges", "Frequent", CV_NETVAR, kartvoterulechanges_cons_t, NULL); static CV_PossibleValue_t kartgametypepreference_cons_t[] = {{-1, "None"}, {GT_RACE, "Race"}, {GT_BATTLE, "Battle"}, {0, NULL}}; -consvar_t cv_kartgametypepreference = CVAR_INIT ("kartgametypepreference", "None", CV_NETVAR, kartgametypepreference_cons_t, NULL); +consvar_t cv_kartgametypepreference = CVAR_INIT ("gametypepreference", "None", CV_NETVAR, kartgametypepreference_cons_t, NULL); static CV_PossibleValue_t kartspeedometer_cons_t[] = {{0, "Off"}, {1, "Percentage"}, {2, "Kilometers"}, {3, "Miles"}, {4, "Fracunits"}, {0, NULL}}; -consvar_t cv_kartspeedometer = CVAR_INIT ("kartdisplayspeed", "Percentage", CV_SAVE, kartspeedometer_cons_t, NULL); // use tics in display +consvar_t cv_kartspeedometer = CVAR_INIT ("speedometer", "Percentage", CV_SAVE, kartspeedometer_cons_t, NULL); // use tics in display static CV_PossibleValue_t kartvoices_cons_t[] = {{0, "Never"}, {1, "Tasteful"}, {2, "Meme"}, {0, NULL}}; -consvar_t cv_kartvoices = CVAR_INIT ("kartvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL); +consvar_t cv_kartvoices = CVAR_INIT ("tauntvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL); static CV_PossibleValue_t kartbot_cons_t[] = { {0, "Off"}, @@ -423,11 +423,11 @@ static CV_PossibleValue_t kartbot_cons_t[] = { {13,"Lv.MAX"}, {0, NULL} }; -consvar_t cv_kartbot = CVAR_INIT ("kartbot", "0", CV_NETVAR, kartbot_cons_t, NULL); +consvar_t cv_kartbot = CVAR_INIT ("bots", "0", CV_NETVAR, kartbot_cons_t, NULL); -consvar_t cv_karteliminatelast = CVAR_INIT ("karteliminatelast", "Yes", CV_NETVAR|CV_CALL, CV_YesNo, KartEliminateLast_OnChange); +consvar_t cv_karteliminatelast = CVAR_INIT ("eliminatelast", "Yes", CV_NETVAR|CV_CALL, CV_YesNo, KartEliminateLast_OnChange); -consvar_t cv_kartusepwrlv = CVAR_INIT ("kartusepwrlv", "Yes", CV_NETVAR, CV_YesNo, NULL); +consvar_t cv_kartusepwrlv = CVAR_INIT ("usepwrlv", "Yes", CV_NETVAR, CV_YesNo, NULL); static CV_PossibleValue_t kartdebugitem_cons_t[] = { @@ -436,20 +436,20 @@ static CV_PossibleValue_t kartdebugitem_cons_t[] = #undef FOREACH {0} }; -consvar_t cv_kartdebugitem = CVAR_INIT ("kartdebugitem", "None", CV_NETVAR|CV_CHEAT, kartdebugitem_cons_t, NULL); +consvar_t cv_kartdebugitem = CVAR_INIT ("debugitem", "None", CV_NETVAR|CV_CHEAT, kartdebugitem_cons_t, NULL); static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}}; -consvar_t cv_kartdebugamount = CVAR_INIT ("kartdebugamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL); +consvar_t cv_kartdebugamount = CVAR_INIT ("debugitemamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL); -consvar_t cv_kartdebugdistribution = CVAR_INIT ("kartdebugdistribution", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); -consvar_t cv_kartdebughuddrop = CVAR_INIT ("kartdebughuddrop", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebugdistribution = CVAR_INIT ("debugitemodds", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebughuddrop = CVAR_INIT ("debugitemdrop", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); static CV_PossibleValue_t kartdebugwaypoint_cons_t[] = {{0, "Off"}, {1, "Forwards"}, {2, "Backwards"}, {0, NULL}}; -consvar_t cv_kartdebugwaypoints = CVAR_INIT ("kartdebugwaypoints", "Off", CV_NETVAR|CV_CHEAT, kartdebugwaypoint_cons_t, NULL); -consvar_t cv_kartdebugbotpredict = CVAR_INIT ("kartdebugbotpredict", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebugwaypoints = CVAR_INIT ("debugwaypoints", "Off", CV_NETVAR|CV_CHEAT, kartdebugwaypoint_cons_t, NULL); +consvar_t cv_kartdebugbotpredict = CVAR_INIT ("debugbotpredict", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); consvar_t cv_kartdebugcheckpoint = CVAR_INIT ("kartdebugcheckpoint", "Off", CV_CHEAT, CV_OnOff, NULL); -consvar_t cv_kartdebugnodes = CVAR_INIT ("kartdebugnodes", "Off", CV_CHEAT, CV_OnOff, NULL); -consvar_t cv_kartdebugcolorize = CVAR_INIT ("kartdebugcolorize", "Off", CV_CHEAT, CV_OnOff, NULL); -consvar_t cv_kartdebugdirector = CVAR_INIT ("kartdebugdirector", "Off", CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebugnodes = CVAR_INIT ("debugnodes", "Off", CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebugcolorize = CVAR_INIT ("debugcolorize", "Off", CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_kartdebugdirector = CVAR_INIT ("debugdirector", "Off", CV_CHEAT, CV_OnOff, NULL); static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}}; consvar_t cv_votetime = CVAR_INIT ("votetime", "20", CV_NETVAR, votetime_cons_t, NULL); From f891535065deb1b68a9dd34d4da7f3021fcaa6df Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 1 Oct 2022 17:44:07 -0700 Subject: [PATCH 3/3] Remove kartdebugcheckpoint, merge into debugwaypoints --- src/d_netcmd.c | 1 - src/d_netcmd.h | 2 +- src/k_hud.c | 25 +++++++++++-------------- src/k_kart.c | 1 - 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 678b36fc7..3473432e5 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -446,7 +446,6 @@ static CV_PossibleValue_t kartdebugwaypoint_cons_t[] = {{0, "Off"}, {1, "Forward consvar_t cv_kartdebugwaypoints = CVAR_INIT ("debugwaypoints", "Off", CV_NETVAR|CV_CHEAT, kartdebugwaypoint_cons_t, NULL); consvar_t cv_kartdebugbotpredict = CVAR_INIT ("debugbotpredict", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); -consvar_t cv_kartdebugcheckpoint = CVAR_INIT ("kartdebugcheckpoint", "Off", CV_CHEAT, CV_OnOff, NULL); consvar_t cv_kartdebugnodes = CVAR_INIT ("debugnodes", "Off", CV_CHEAT, CV_OnOff, NULL); consvar_t cv_kartdebugcolorize = CVAR_INIT ("debugcolorize", "Off", CV_CHEAT, CV_OnOff, NULL); consvar_t cv_kartdebugdirector = CVAR_INIT ("debugdirector", "Off", CV_CHEAT, CV_OnOff, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index f045b1121..7fb6c4c53 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -120,7 +120,7 @@ extern consvar_t cv_kartusepwrlv; extern consvar_t cv_votetime; extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugdistribution, cv_kartdebughuddrop; -extern consvar_t cv_kartdebugcheckpoint, cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector; +extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector; extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbotpredict; extern consvar_t cv_itemfinder; diff --git a/src/k_hud.c b/src/k_hud.c index 474661a7f..72816abb1 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -4554,23 +4554,23 @@ static void K_drawDistributionDebugger(void) V_DrawString(0, 0, V_SNAPTOTOP, va("USEODDS %d", useodds)); } -static void K_drawCheckpointDebugger(void) +static void K_DrawWaypointDebugger(void) { + if (cv_kartdebugwaypoints.value == 0) + return; + if (stplyr != &players[displayplayers[0]]) // only for p1 return; - if (stplyr->starpostnum == numstarposts) - V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts)); - else - V_DrawString(8, 184, 0, va("Checkpoint: %d / %d", stplyr->starpostnum, numstarposts)); -} + V_DrawString(8, 166, 0, va("'Best' Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint))); + V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish)); -static void K_DrawWaypointDebugger(void) -{ - if ((cv_kartdebugwaypoints.value != 0) && (stplyr == &players[displayplayers[0]])) + if (numstarposts > 0) { - V_DrawString(8, 166, 0, va("'Best' Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint))); - V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish)); + if (stplyr->starpostnum == numstarposts) + V_DrawString(8, 186, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts)); + else + V_DrawString(8, 186, 0, va("Checkpoint: %d / %d", stplyr->starpostnum, numstarposts)); } } @@ -4785,9 +4785,6 @@ void K_drawKartHUD(void) if (cv_kartdebugdistribution.value) K_drawDistributionDebugger(); - if (cv_kartdebugcheckpoint.value) - K_drawCheckpointDebugger(); - if (cv_kartdebugnodes.value) { UINT8 p; diff --git a/src/k_kart.c b/src/k_kart.c index ad7818bf9..7978c97fc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -260,7 +260,6 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartdebugwaypoints); CV_RegisterVar(&cv_kartdebugbotpredict); - CV_RegisterVar(&cv_kartdebugcheckpoint); CV_RegisterVar(&cv_kartdebugnodes); CV_RegisterVar(&cv_kartdebugcolorize); CV_RegisterVar(&cv_kartdebugdirector);