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

Debug checkpoint, and prevent spinout/booster timers while in the air

Browse source
This commit is contained in:
TehRealSalt 2018-06-17 18:10:42 -04:00
parent 3aed1df8eb
commit 2497d9c96c
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_netcmd.c
View file

@ -369,6 +369,7 @@ static CV_PossibleValue_t kartdebugitem_cons_t[] = {{-1, "MIN"}, {NUMKARTITEMS-1
consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}}; static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_kartdebugcheckpoint = {"kartdebugcheckpoint", "Off", CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}}; static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}};
consvar_t cv_votetime = {"votetime", "20", CV_NETVAR, votetime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_votetime = {"votetime", "20", CV_NETVAR, votetime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

2
src/d_netcmd.h
View file

@ -129,7 +129,7 @@ extern consvar_t cv_kartspeedometer;
extern consvar_t cv_votetime; extern consvar_t cv_votetime;
extern consvar_t cv_kartdebugitem, cv_kartdebugamount; extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugcheckpoint;
extern consvar_t cv_itemfinder; extern consvar_t cv_itemfinder;

19
src/k_kart.c
View file

@ -330,6 +330,7 @@ void K_RegisterKartStuff(void)
CV_RegisterVar(&cv_kartdebugitem); CV_RegisterVar(&cv_kartdebugitem);
CV_RegisterVar(&cv_kartdebugamount); CV_RegisterVar(&cv_kartdebugamount);
CV_RegisterVar(&cv_kartdebugcheckpoint);
} }
//} //}
@ -2423,10 +2424,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->mo->colorized = false; player->mo->colorized = false;
} }
if (player->kartstuff[k_spinout]) if (player->kartstuff[k_spinout] && P_IsObjectOnGround(player->mo))
player->kartstuff[k_spinout]--; player->kartstuff[k_spinout]--;
if (player->kartstuff[k_spinouttimer]) if (player->kartstuff[k_spinouttimer] && P_IsObjectOnGround(player->mo))
player->kartstuff[k_spinouttimer]--; player->kartstuff[k_spinouttimer]--;
else if (!comeback) else if (!comeback)
player->kartstuff[k_comebacktimer] = comebacktime; player->kartstuff[k_comebacktimer] = comebacktime;
@ -2443,7 +2444,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_attractiontimer]) if (player->kartstuff[k_attractiontimer])
player->kartstuff[k_attractiontimer]--; player->kartstuff[k_attractiontimer]--;
if (player->kartstuff[k_sneakertimer]) if (player->kartstuff[k_sneakertimer] && P_IsObjectOnGround(player->mo))
player->kartstuff[k_sneakertimer]--; player->kartstuff[k_sneakertimer]--;
if (player->kartstuff[k_floorboost]) if (player->kartstuff[k_floorboost])
@ -4966,6 +4967,15 @@ static void K_drawLapLakitu(void)
V_DrawSmallScaledPatch(LAKI_X+14+(swoopTimer/4), LAKI_Y + adjustY, V_SNAPTOTOP, localpatch); V_DrawSmallScaledPatch(LAKI_X+14+(swoopTimer/4), LAKI_Y + adjustY, V_SNAPTOTOP, localpatch);
} }
static void K_drawCheckpointDebugger(void)
{
if ((numstarposts/2 + 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 (Skip: %d)", stplyr->starpostnum, numstarposts, (numstarposts/2 + stplyr->starpostnum)));
V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
}
void K_drawKartHUD(void) void K_drawKartHUD(void)
{ {
// Define the X and Y for each drawn object // Define the X and Y for each drawn object
@ -5052,6 +5062,9 @@ void K_drawKartHUD(void)
K_drawKartBalloonsOrKarma(); K_drawKartBalloonsOrKarma();
} }
} }
if (cv_kartdebugcheckpoint.value)
K_drawCheckpointDebugger();
} }
//} //}