incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set bumpspark/bumpspring to their correct values

Browse source 
Version 1 = before Sep 15, Version 2 = after Sep 22
(ignoring the 1-week timeframe where bumpspark was On in all modes)
(also ignoring that bumpspring has been On in all modes since Sep 15?)

Also correct the compatlevel check for these
This commit is contained in:
GenericHeroGuy 2025-10-21 22:08:14 +02:00
parent 8f13c49e10
commit 94fd921db0
4 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_demo.c
View file

@ -3702,7 +3702,7 @@ void G_DoPlayDemo(char *defdemoname)
if (pv)
{
const char *faulted = G_CheckPresetCvars(pv);
if (faulted)
if (faulted && !G_CompatLevel(0x000C))
M_StartMessage(va("Demo cvar %s doesn't match the preset! This may be a mistake, or the demo is cheated!\n", faulted), NULL, MM_NOTHING);
}
else

17
src/g_game.c
View file

@ -687,6 +687,11 @@ void G_ClearRecords(void)
pv = G_AddRecordPresetVersion(preset, 1);
strbuf_append(&pv, "kartbumpspark");
strbuf_append(&pv, "Off");
strbuf_append(&pv, "kartbumpspring");
strbuf_append(&pv, "No");
preset = G_AddRecordPreset("tech", "Tech Mode");
pv = G_AddRecordPresetVersion(preset, 1);
@ -696,6 +701,10 @@ void G_ClearRecords(void)
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartslopeboost");
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartbumpspark");
strbuf_append(&pv, "Off");
strbuf_append(&pv, "kartbumpspring");
strbuf_append(&pv, "No");
pv = G_AddRecordPresetVersion(preset, 2);
strbuf_append(&pv, "kartstacking");
@ -708,6 +717,8 @@ void G_ClearRecords(void)
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartbumpspark");
strbuf_append(&pv, "On");
strbuf_append(&pv, "kartbumpspring");
strbuf_append(&pv, "Yes");
preset = G_AddRecordPreset("blankart", "BlanKart Mode");
@ -724,6 +735,10 @@ void G_ClearRecords(void)
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartslopeboost");
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartbumpspark");
strbuf_append(&pv, "Off");
strbuf_append(&pv, "kartbumpspring");
strbuf_append(&pv, "No");
pv = G_AddRecordPresetVersion(preset, 2);
strbuf_append(&pv, "kartrings");
@ -742,6 +757,8 @@ void G_ClearRecords(void)
strbuf_append(&pv, "Yes");
strbuf_append(&pv, "kartbumpspark");
strbuf_append(&pv, "Remove Charge Only");
strbuf_append(&pv, "kartbumpspring");
strbuf_append(&pv, "Yes");
}
// For easy retrieval of records

2
src/k_kart.c
View file

@ -6513,7 +6513,7 @@ static void K_RaceStart(player_t *player)
player->boostcharge = player->cmd.latency;
// RA ez charge for less annoying starts.
if (modeattacking != ATTACKING_NONE && !G_CompatLevel(0x0009))
if (modeattacking != ATTACKING_NONE && !G_CompatLevel(0x000A))
{
SINT8 clampsize = 0;
// Let players choose between startboost and sneaker boost by holding item.

4
src/p_map.c
View file

@ -3499,7 +3499,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
UINT32 basecharge = min(mo->player->driftcharge, K_GetKartDriftSparkValue(mo->player));
if ((bumpspark < BUMPSPARK_ALL) ||
(modeattacking != ATTACKING_NONE && G_CompatLevel(0x0009)))
(modeattacking != ATTACKING_NONE && G_CompatLevel(0x000A)))
{
if (!bumpspark)
{
@ -3517,7 +3517,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
// Regardless of bumpspark, tell bots to stop drifting if they bonk a wall.
K_BotSetDriftState(mo->player, DRIFTSTATE_AUTO, TICRATE);
if ((!cv_kartbumpspring.value && modeattacking == ATTACKING_NONE) || (modeattacking != ATTACKING_NONE && G_CompatLevel(0x0009)))
if (!cv_kartbumpspring.value || (modeattacking != ATTACKING_NONE && G_CompatLevel(0x000A)))
{
mo->player->pogospring = 0;
}