From 2016bb4f4b3c00b6d037727d0a5f4e7e6847fc0b Mon Sep 17 00:00:00 2001 From: Samuel Villareal Date: Mon, 13 Sep 2010 03:25:23 +0000 Subject: + Fix for flaming death in P_KillMobj + Attackdistance fix for A_FireMauler1 Subversion-branch: /branches/strife-branch Subversion-revision: 2081 --- src/strife/p_inter.c | 2 +- src/strife/p_pspr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/strife') diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index ebe895a0..4a50de4c 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -727,7 +727,7 @@ void P_KillMobj(mobj_t* source, mobj_t* target) } // villsa [STRIFE] some modifications to setting states - if(target->state != &states[S_BLST_23]) // 1860 / 20 + if(target->state != &states[S_BURN_23]) { if(target->health == -6666) P_SetMobjState(target, S_DISR_00); // 373 diff --git a/src/strife/p_pspr.c b/src/strife/p_pspr.c index b4e7c1c2..a8788354 100644 --- a/src/strife/p_pspr.c +++ b/src/strife/p_pspr.c @@ -727,7 +727,7 @@ void A_FireMauler1(player_t* player, pspdef_t* pspr) damage = 5*(P_Random ()%3+1); angle = player->mo->angle; angle += (P_Random()-P_Random())<<19; - P_LineAttack(player->mo, angle, MISSILERANGE, + P_LineAttack(player->mo, angle, (2112*FRACUNIT), bulletslope + ((P_Random()-P_Random())<<5), damage); } } -- cgit v1.2.3