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

Fix standalone hangable chains being broken, thanks to toaster.

Browse source
This commit is contained in:
sphere 2019-10-17 01:01:40 +02:00
parent 46567ab147
commit 232a558f2e
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/info.c
View file

@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_SMALLGRABCHAIN { // MT_SMALLGRABCHAIN
-1, // doomednum 1132, // doomednum
S_SMALLGRABCHAIN, // spawnstate S_SMALLGRABCHAIN, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -11185,7 +11185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_BIGGRABCHAIN { // MT_BIGGRABCHAIN
-1, // doomednum 1133, // doomednum
S_BIGGRABCHAIN, // spawnstate S_BIGGRABCHAIN, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate

3
src/p_user.c
View file

@ -4345,7 +4345,6 @@ void P_DoJump(player_t *player, boolean soundandstate)
{ {
player->mo->momz = 9*FRACUNIT; player->mo->momz = 9*FRACUNIT;
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
player->mo->tracer->flags |= MF_PUSHABLE;
P_SetTarget(&player->mo->tracer->target, NULL); P_SetTarget(&player->mo->tracer->target, NULL);
P_SetTarget(&player->mo->tracer, NULL); P_SetTarget(&player->mo->tracer, NULL);
} }
@ -12057,7 +12056,7 @@ void P_PlayerAfterThink(player_t *player)
mo->momx = rock->momx; mo->momx = rock->momx;
mo->momy = rock->momy; mo->momy = rock->momy;
mo->momz = 0; mo->momz = 0;
if (player->panim == PA_IDLE && (mo->momx || mo->momy)) if (player->panim == PA_IDLE && (mo->momx || mo->momy))
{ {
P_SetPlayerMobjState(player->mo, S_PLAY_WALK); P_SetPlayerMobjState(player->mo, S_PLAY_WALK);