stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 10:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cleanupv2' into sonickart

Browse source
This commit is contained in:
Sryder 2017-03-06 03:25:20 +00:00
commit 88e2c460df
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -1105,7 +1105,7 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, boolean forwardmove
if (!onground) return 0; // If the player isn't on the ground, there is no change in speed if (!onground) return 0; // If the player isn't on the ground, there is no change in speed
// ACCELCODE!!!1!11! // ACCELCODE!!!1!11!
oldspeed = P_AproxDistance(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);
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);
finalspeed = newspeed - oldspeed; finalspeed = newspeed - oldspeed;

4
src/p_saveg.c
View file

@ -136,6 +136,8 @@ static void P_NetArchivePlayers(void)
for (j = 0; j < NUMPOWERS; j++) for (j = 0; j < NUMPOWERS; j++)
WRITEUINT16(save_p, players[i].powers[j]); WRITEUINT16(save_p, players[i].powers[j]);
for (j = 0; j < NUMKARTSTUFF; j++)
WRITEUINT16(save_p, players[i].kartstuff[j]);
WRITEUINT8(save_p, players[i].playerstate); WRITEUINT8(save_p, players[i].playerstate);
WRITEUINT32(save_p, players[i].pflags); WRITEUINT32(save_p, players[i].pflags);
@ -315,6 +317,8 @@ static void P_NetUnArchivePlayers(void)
for (j = 0; j < NUMPOWERS; j++) for (j = 0; j < NUMPOWERS; j++)
players[i].powers[j] = READUINT16(save_p); players[i].powers[j] = READUINT16(save_p);
for (j = 0; j < NUMKARTSTUFF; j++)
players[i].kartstuff[j] = READUINT16(save_p);
players[i].playerstate = READUINT8(save_p); players[i].playerstate = READUINT8(save_p);
players[i].pflags = READUINT32(save_p); players[i].pflags = READUINT32(save_p);