thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 21:12:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable the speedcap on players.

Browse source 
Don't calculate acceleration as ever being above top speed.
This commit is contained in:
Sryder 2019-05-08 20:49:47 +01:00
parent 4dca09f420
commit 682a8f6829
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -1636,7 +1636,7 @@ static void K_DrawDraftCombiring(player_t *player, player_t *victim, fixed_t cur
curx += stepx; curx += stepx;
cury += stepy; cury += stepy;
curz += stepz; curz += stepz;
offset = abs(offset-1) % 3; offset = abs(offset-1) % 3;
n--; n--;
} }
@ -2241,7 +2241,7 @@ static void K_GetKartBoostPower(player_t *player)
{ {
speedboost += (player->kartstuff[k_draftpower]) / 3; // + 0 to 33.3% top speed speedboost += (player->kartstuff[k_draftpower]) / 3; // + 0 to 33.3% top speed
//accelboost += (FRACUNIT / 3); // + 33.3% acceleration //accelboost += (FRACUNIT / 3); // + 33.3% acceleration
numboosts++; // (Drafting suffers no boost stack penalty!) numboosts++; // (Drafting suffers no boost stack penalty!)
} }
player->kartstuff[k_boostpower] = boostpower; player->kartstuff[k_boostpower] = boostpower;
@ -2319,6 +2319,9 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
// ACCELCODE!!!1!11! // ACCELCODE!!!1!11!
oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale); oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale);
// Don't calculate the acceleration as ever being above top speed
if (oldspeed > p_speed)
oldspeed = p_speed;
newspeed = FixedDiv(FixedDiv(FixedMul(oldspeed, accelmax - p_accel) + FixedMul(p_speed, p_accel), accelmax), ORIG_FRICTION); newspeed = FixedDiv(FixedDiv(FixedMul(oldspeed, accelmax - p_accel) + FixedMul(p_speed, p_accel), accelmax), ORIG_FRICTION);
if (player->kartstuff[k_pogospring]) // Pogo Spring minimum/maximum thrust if (player->kartstuff[k_pogospring]) // Pogo Spring minimum/maximum thrust
@ -3413,7 +3416,7 @@ void K_SpawnDraftDust(mobj_t *mo)
ang = mo->player->frameangle; ang = mo->player->frameangle;
if (mo->player->kartstuff[k_drift] != 0) if (mo->player->kartstuff[k_drift] != 0)
{ {
drifting = true; drifting = true;
ang += (mo->player->kartstuff[k_drift] * ((ANGLE_270 + ANGLE_22h) / 5)); // -112.5 doesn't work. I fucking HATE SRB2 angles ang += (mo->player->kartstuff[k_drift] * ((ANGLE_270 + ANGLE_22h) / 5)); // -112.5 doesn't work. I fucking HATE SRB2 angles
@ -8382,7 +8385,7 @@ static void K_drawKartRingsAndLives(void)
} }
else if (stplyr->kartstuff[k_rings] >= 20) // Maxed out else if (stplyr->kartstuff[k_rings] >= 20) // Maxed out
ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE); ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE);
if (netgame) if (netgame)
V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[1]); V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[1]);

4
src/p_user.c
View file

@ -4184,6 +4184,7 @@ static void P_3dMovement(player_t *player)
// If "no" to 2, normalize to topspeed, so we can't suddenly run faster than it of our own accord. // If "no" to 2, normalize to topspeed, so we can't suddenly run faster than it of our own accord.
// If "no" to 1, we're not reaching any limits yet, so ignore this entirely! // If "no" to 1, we're not reaching any limits yet, so ignore this entirely!
// -Shadow Hog // -Shadow Hog
/*
newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0); newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
if (newMagnitude > K_GetKartSpeed(player, true)) //topspeed) if (newMagnitude > K_GetKartSpeed(player, true)) //topspeed)
{ {
@ -4207,6 +4208,7 @@ static void P_3dMovement(player_t *player)
player->mo->momy = tempmomy + player->cmomy; player->mo->momy = tempmomy + player->cmomy;
} }
} }
*/
} }
// //
@ -7352,7 +7354,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (P_CameraThinker(player, thiscam, resetcalled)) if (P_CameraThinker(player, thiscam, resetcalled))
return true; return true;
if (thiscam == &camera[1]) // Camera 2 if (thiscam == &camera[1]) // Camera 2
{ {
num = 1; num = 1;