diff --git a/src/g_demo.cpp b/src/g_demo.cpp index 2f9c64626..f0df146b6 100644 --- a/src/g_demo.cpp +++ b/src/g_demo.cpp @@ -182,9 +182,10 @@ demoghost *ghosts = NULL; // - 0x000F -- RR 2.4 indev (staff ghosts part 2 - dynslopes thinker fix) // - 0x0010 -- RR 2.4 rc1 (staff ghosts part 3 - skinlimit raise. don't say we never did anythin for 'ya) // - 0x0011 -- RR 2.4 rc2 (K_FlipFromObject oversight) +// - 0x0012 -- RR 2.4 rc6 (Waterskii regression from 2.3) #define MINDEMOVERSION 0x000E -#define DEMOVERSION 0x0011 +#define DEMOVERSION 0x0012 boolean G_CompatLevel(UINT16 level) { diff --git a/src/k_kart.c b/src/k_kart.c index 2d42bcd3a..79bdb8110 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3323,7 +3323,7 @@ boolean K_WaterRun(mobj_t *mobj) return false; } - case MT_PLAYER: + case MT_PLAYER: // Waterskii { fixed_t minspeed = 0; fixed_t flatspeed = 2 * K_GetKartSpeed(mobj->player, false, false); @@ -3340,7 +3340,7 @@ boolean K_WaterRun(mobj_t *mobj) minspeed = K_PlayerTripwireSpeedThreshold(mobj->player); - if (minspeed >= flatspeed) + if (minspeed >= flatspeed && !G_CompatLevel(0x0011)) minspeed = flatspeed; if (mobj->player->invincibilitytimer