From cdaab7ec9f527f79c3c07d6cdd8ed887295a0333 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Fri, 30 Sep 2016 16:00:34 +0100 Subject: [PATCH] * Upped speed of info.c's red and yellow horizontal springs * Turn off friction for the one tic after touching a spring --- src/info.c | 4 ++-- src/p_mobj.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 884217611..bbda94afc 100644 --- a/src/info.c +++ b/src/info.c @@ -5610,7 +5610,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 32*FRACUNIT, // height 0, // display offset 0, // mass - 16*FRACUNIT, // damage + 36*FRACUNIT, // damage sfx_None, // activesound MF_SOLID|MF_SPRING|MF_NOGRAVITY, // flags S_YHORIZ2 // raisestate @@ -5637,7 +5637,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 32*FRACUNIT, // height 0, // display offset 0, // mass - 64*FRACUNIT, // damage + 72*FRACUNIT, // damage sfx_None, // activesound MF_SOLID|MF_SPRING|MF_NOGRAVITY, // flags S_RHORIZ2 // raisestate diff --git a/src/p_mobj.c b/src/p_mobj.c index 6f655c15a..988cb2f0e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1858,7 +1858,7 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) mo->momx = player->cmomx; mo->momy = player->cmomy; } - else + else if (!(mo->eflags & MFE_SPRUNG)) { if (oldx == mo->x && oldy == mo->y) // didn't go anywhere {