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

Merge branch 'master' into 102-gameplay

Browse source
This commit is contained in:
TehRealSalt 2018-11-24 17:44:20 -05:00
commit 9288f4563d
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -811,7 +811,7 @@ static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT3
players[i].mo->y - player->mo->y), players[i].mo->y - player->mo->y),
players[i].mo->z - player->mo->z) / mapheaderinfo[gamemap-1]->mobj_scale players[i].mo->z - player->mo->z) / mapheaderinfo[gamemap-1]->mobj_scale
* (pingame - players[i].kartstuff[k_position]) * (pingame - players[i].kartstuff[k_position])
/ ((pingame - 1) * (pingame + 1) / 3); / max(1, ((pingame - 1) * (pingame + 1) / 3));
} }
#define SETUPDISTTABLE(odds, num) \ #define SETUPDISTTABLE(odds, num) \
@ -7502,7 +7502,7 @@ static void K_drawBattleFullscreen(void)
else else
K_drawKartFinish(); K_drawKartFinish();
} }
else if (stplyr->kartstuff[k_bumper] <= 0 && stplyr->kartstuff[k_comebacktimer] && comeback) else if (stplyr->kartstuff[k_bumper] <= 0 && stplyr->kartstuff[k_comebacktimer] && comeback && !stplyr->spectator)
{ {
UINT16 t = stplyr->kartstuff[k_comebacktimer]/(10*TICRATE); UINT16 t = stplyr->kartstuff[k_comebacktimer]/(10*TICRATE);
INT32 txoff, adjust = (splitscreen > 1) ? 4 : 6; // normal string is 8, kart string is 12, half of that for ease INT32 txoff, adjust = (splitscreen > 1) ? 4 : 6; // normal string is 8, kart string is 12, half of that for ease

2
src/p_spec.c
View file

@ -4098,7 +4098,6 @@ DoneSection2:
P_SetTarget(&player->mo->tracer, waypoint); P_SetTarget(&player->mo->tracer, waypoint);
player->speed = speed; player->speed = speed;
player->pflags &= ~PF_SPINNING; // SRB2kart 200117 player->pflags &= ~PF_SPINNING; // SRB2kart 200117
player->pflags |= PF_SPINNING;
player->pflags &= ~PF_JUMPED; player->pflags &= ~PF_JUMPED;
player->pflags &= ~PF_GLIDING; player->pflags &= ~PF_GLIDING;
player->climbing = 0; player->climbing = 0;
@ -4176,7 +4175,6 @@ DoneSection2:
P_SetTarget(&player->mo->tracer, waypoint); P_SetTarget(&player->mo->tracer, waypoint);
player->speed = speed; player->speed = speed;
player->pflags &= ~PF_SPINNING; // SRB2kart 200117 player->pflags &= ~PF_SPINNING; // SRB2kart 200117
player->pflags |= PF_SPINNING;
player->pflags &= ~PF_JUMPED; player->pflags &= ~PF_JUMPED;
if (!(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2])) if (!(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2]))