diff --git a/src/g_demo.c b/src/g_demo.c index 618edfeae..2877424d6 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -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 diff --git a/src/g_game.c b/src/g_game.c index bf0d2a491..b19f41e2e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -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 diff --git a/src/k_kart.c b/src/k_kart.c index fab15f111..44e50a570 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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. diff --git a/src/p_map.c b/src/p_map.c index e6a5df5b9..c5b3407e6 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -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; }