vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer

This commit is contained in:
mazmazz 2019-01-03 12:31:26 -05:00
parent 5f632d9b3c e52d5fd2fd
commit 788c75ecdf
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d_main.c
View File

@ -321,7 +321,7 @@ static void D_Display(void)
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
} }
if (wipegamestate == GS_LEVEL && rendermode != render_none) if (gamestate != GS_LEVEL && rendermode != render_none)
{ {
V_SetPaletteLump("PLAYPAL"); // Reset the palette V_SetPaletteLump("PLAYPAL"); // Reset the palette
R_ReInitColormaps(0, LUMPERROR); R_ReInitColormaps(0, LUMPERROR);

8
src/k_kart.c
View File

@ -4786,22 +4786,22 @@ void K_KartUpdatePosition(player_t *player)
mo->y - players[i].mo->y), mo->y - players[i].mo->y),
mo->z - players[i].mo->z) / FRACUNIT; mo->z - players[i].mo->z) / FRACUNIT;
if (mo->health == player->starpostnum) if (mo->health == player->starpostnum && (!mo->movecount || mo->movecount == player->laps+1))
{ {
player->kartstuff[k_prevcheck] += pmo; player->kartstuff[k_prevcheck] += pmo;
ppcd++; ppcd++;
} }
if (mo->health == (player->starpostnum + 1)) if (mo->health == (player->starpostnum + 1) && (!mo->movecount || mo->movecount == player->laps+1))
{ {
player->kartstuff[k_nextcheck] += pmo; player->kartstuff[k_nextcheck] += pmo;
pncd++; pncd++;
} }
if (mo->health == players[i].starpostnum) if (mo->health == players[i].starpostnum && (!mo->movecount || mo->movecount == players[i].laps+1))
{ {
players[i].kartstuff[k_prevcheck] += imo; players[i].kartstuff[k_prevcheck] += imo;
ipcd++; ipcd++;
} }
if (mo->health == (players[i].starpostnum + 1)) if (mo->health == (players[i].starpostnum + 1) && (!mo->movecount || mo->movecount == players[i].laps+1))
{ {
players[i].kartstuff[k_nextcheck] += imo; players[i].kartstuff[k_nextcheck] += imo;
incd++; incd++;

5
src/p_map.c
View File

@ -3809,6 +3809,7 @@ void P_BouncePlayerMove(mobj_t *mo)
fixed_t leadx, leady; fixed_t leadx, leady;
fixed_t trailx, traily; fixed_t trailx, traily;
fixed_t mmomx = 0, mmomy = 0; fixed_t mmomx = 0, mmomy = 0;
fixed_t oldmomx = mo->momx, oldmomy = mo->momy;
if (!mo->player) if (!mo->player)
return; return;
@ -3897,7 +3898,9 @@ void P_BouncePlayerMove(mobj_t *mo)
mo->player->cmomx = tmxmove; mo->player->cmomx = tmxmove;
mo->player->cmomy = tmymove; mo->player->cmomy = tmymove;
P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true); if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) {
P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
}
} }
// //

1
src/p_mobj.c
View File

@ -11896,6 +11896,7 @@ ML_NOCLIMB : Direction not controllable
else if (i == MT_BOSS3WAYPOINT) // SRB2kart 120217 - Used to store checkpoint num else if (i == MT_BOSS3WAYPOINT) // SRB2kart 120217 - Used to store checkpoint num
{ {
mobj->health = mthing->angle; mobj->health = mthing->angle;
mobj->movecount = mthing->extrainfo;
P_SetTarget(&mobj->tracer, waypointcap); P_SetTarget(&mobj->tracer, waypointcap);
P_SetTarget(&waypointcap, mobj); P_SetTarget(&waypointcap, mobj);
} }