thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

commit throwdir fix

Browse source 
I did a bunch of other demo-related cleanup in this branch so I'm throwing it in here too
This commit is contained in:
TehRealSalt 2019-09-23 08:51:49 -04:00
parent a46036e489
commit 53848bd5fa
3 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/g_game.c
View file

@ -2368,21 +2368,7 @@ void G_Ticker(boolean run)
if (playeringame[i]) if (playeringame[i])
{ {
//@TODO all this throwdir stuff shouldn't be here! But it stays for now to maintain 1.0.4 compat...
// Remove for 1.1!
// SRB2kart
// Save the dir the player is holding
// to allow items to be thrown forward or backward.
if (cmd->buttons & BT_FORWARD)
players[i].kartstuff[k_throwdir] = 1;
else if (cmd->buttons & BT_BACKWARD)
players[i].kartstuff[k_throwdir] = -1;
else
players[i].kartstuff[k_throwdir] = 0;
G_CopyTiccmd(cmd, &netcmds[buf][i], 1); G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
// Use the leveltime sent in the player's ticcmd to determine control lag // Use the leveltime sent in the player's ticcmd to determine control lag
cmd->latency = modeattacking ? 0 : min(((leveltime & 0xFF) - cmd->latency) & 0xFF, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max cmd->latency = modeattacking ? 0 : min(((leveltime & 0xFF) - cmd->latency) & 0xFF, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
} }

11
src/p_tick.c
View file

@ -620,18 +620,7 @@ void P_Ticker(boolean run)
G_ReadDemoExtraData(); G_ReadDemoExtraData();
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i]) if (playeringame[i])
{
//@TODO all this throwdir stuff shouldn't be here! But it's added to maintain 1.0.4 compat for now...
// Remove for 1.1!
if (players[i].cmd.buttons & BT_FORWARD)
players[i].kartstuff[k_throwdir] = 1;
else if (players[i].cmd.buttons & BT_BACKWARD)
players[i].kartstuff[k_throwdir] = -1;
else
players[i].kartstuff[k_throwdir] = 0;
G_ReadDemoTiccmd(&players[i].cmd, i); G_ReadDemoTiccmd(&players[i].cmd, i);
}
} }
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)

3
src/p_user.c
View file

@ -8136,8 +8136,6 @@ void P_PlayerThink(player_t *player)
cmd = &player->cmd; cmd = &player->cmd;
//@TODO This fixes a one-tic latency on direction handling, AND makes behavior consistent while paused, but is not BC with 1.0.4. Do this for 1.1!
#if 0
// SRB2kart // SRB2kart
// Save the dir the player is holding // Save the dir the player is holding
// to allow items to be thrown forward or backward. // to allow items to be thrown forward or backward.
@ -8147,7 +8145,6 @@ void P_PlayerThink(player_t *player)
player->kartstuff[k_throwdir] = -1; player->kartstuff[k_throwdir] = -1;
else else
player->kartstuff[k_throwdir] = 0; player->kartstuff[k_throwdir] = 0;
#endif
// Add some extra randomization. // Add some extra randomization.
if (cmd->forwardmove) if (cmd->forwardmove)