From cb76368326d70bd8708a8180f75740e580c1312d Mon Sep 17 00:00:00 2001 From: James Haley Date: Tue, 5 Oct 2010 02:43:51 +0000 Subject: Weird side effects of sigil -1 turned out to be due to small error in sigil self-damage calculation. Subversion-branch: /branches/strife-branch Subversion-revision: 2158 --- src/strife/p_pspr.c | 2 +- src/strife/p_user.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/strife/p_pspr.c b/src/strife/p_pspr.c index 4794ecc2..a41a372f 100644 --- a/src/strife/p_pspr.c +++ b/src/strife/p_pspr.c @@ -787,7 +787,7 @@ void A_FireSigil(player_t* player, pspdef_t* pspr) // keep info on armor because sigil does piercing damage i = player->armortype; player->armortype = 0; - P_DamageMobj(player->mo, player->mo, 0, 4 * player->sigiltype + 1); + P_DamageMobj(player->mo, player->mo, 0, 4 * (player->sigiltype + 1)); // restore armor player->armortype = i; diff --git a/src/strife/p_user.c b/src/strife/p_user.c index 9704f788..f3580b0c 100644 --- a/src/strife/p_user.c +++ b/src/strife/p_user.c @@ -308,8 +308,6 @@ void P_DeathThink(player_t* player) if(player->pitch <= 90) player->pitch = player->pitch + 3; - - if(player->cmd.buttons & BT_USE) player->playerstate = PST_REBORN; } -- cgit v1.2.3