From 26fed7767138bc6570aceacef5d969061d42a06a Mon Sep 17 00:00:00 2001 From: sphere Date: Thu, 17 Oct 2019 01:01:40 +0200 Subject: [PATCH] Fix standalone hangable chains being broken, thanks to toaster. --- src/info.c | 4 ++-- src/p_user.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/info.c b/src/info.c index 33340876e..655664f9b 100644 --- a/src/info.c +++ b/src/info.c @@ -11158,7 +11158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_SMALLGRABCHAIN - -1, // doomednum + 1132, // doomednum S_SMALLGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate @@ -11185,7 +11185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_BIGGRABCHAIN - -1, // doomednum + 1133, // doomednum S_BIGGRABCHAIN, // spawnstate 1000, // spawnhealth S_NULL, // seestate diff --git a/src/p_user.c b/src/p_user.c index 33f84e2db..a67274d79 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4345,7 +4345,6 @@ void P_DoJump(player_t *player, boolean soundandstate) { player->mo->momz = 9*FRACUNIT; player->powers[pw_carry] = CR_NONE; - player->mo->tracer->flags |= MF_PUSHABLE; P_SetTarget(&player->mo->tracer->target, NULL); P_SetTarget(&player->mo->tracer, NULL); } @@ -12057,7 +12056,7 @@ void P_PlayerAfterThink(player_t *player) mo->momx = rock->momx; mo->momy = rock->momy; mo->momz = 0; - + if (player->panim == PA_IDLE && (mo->momx || mo->momy)) { P_SetPlayerMobjState(player->mo, S_PLAY_WALK);