stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use toaster's approach to fix 0th position

Browse source
This commit is contained in:
JugadorXEI 2021-05-30 18:45:38 +02:00
parent 4d8d5d7fa9
commit 63f87b4cec
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.c
View file

@ -2598,7 +2598,6 @@ void G_PlayerReborn(INT32 player)
SINT8 pity; SINT8 pity;
// SRB2kart // SRB2kart
INT32 position;
INT32 starpostwp; INT32 starpostwp;
INT32 itemtype; INT32 itemtype;
INT32 itemamount; INT32 itemamount;
@ -2661,12 +2660,10 @@ void G_PlayerReborn(INT32 player)
bumper = (G_BattleGametype() ? cv_kartbumpers.value : 0); bumper = (G_BattleGametype() ? cv_kartbumpers.value : 0);
comebackpoints = 0; comebackpoints = 0;
wanted = 0; wanted = 0;
position = 0;
starpostwp = 0; starpostwp = 0;
} }
else else
{ {
position = players[player].kartstuff[k_position];
starpostwp = players[player].kartstuff[k_starpostwp]; starpostwp = players[player].kartstuff[k_starpostwp];
itemroulette = (players[player].kartstuff[k_itemroulette] > 0 ? 1 : 0); itemroulette = (players[player].kartstuff[k_itemroulette] > 0 ? 1 : 0);
@ -2734,7 +2731,6 @@ void G_PlayerReborn(INT32 player)
p->pity = pity; p->pity = pity;
// SRB2kart // SRB2kart
p->kartstuff[k_position] = position;
p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync
p->kartstuff[k_itemroulette] = itemroulette; p->kartstuff[k_itemroulette] = itemroulette;
p->kartstuff[k_roulettetype] = roulettetype; p->kartstuff[k_roulettetype] = roulettetype;

1
src/k_kart.c
View file

@ -952,6 +952,7 @@ static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT3
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (playeringame[i] && !players[i].spectator && players[i].mo if (playeringame[i] && !players[i].spectator && players[i].mo
&& players[i].kartstuff[k_position] != 0
&& players[i].kartstuff[k_position] < player->kartstuff[k_position]) && players[i].kartstuff[k_position] < player->kartstuff[k_position])
pdis += P_AproxDistance(P_AproxDistance(players[i].mo->x - player->mo->x, pdis += P_AproxDistance(P_AproxDistance(players[i].mo->x - player->mo->x,
players[i].mo->y - player->mo->y), players[i].mo->y - player->mo->y),