diff options
| author | James Haley | 2010-10-04 05:11:14 +0000 |
|---|---|---|
| committer | James Haley | 2010-10-04 05:11:14 +0000 |
| commit | 1a758de7023a79d8a9b44904caf938e58807fbbe (patch) | |
| tree | 07153fdae13c3af41039706b429b9462ff296d98 /src/strife/p_inter.c | |
| parent | dbbc0e16e6392c068fb9d689c87a207d6b58da4c (diff) | |
| download | chocolate-doom-1a758de7023a79d8a9b44904caf938e58807fbbe.tar.gz chocolate-doom-1a758de7023a79d8a9b44904caf938e58807fbbe.tar.bz2 chocolate-doom-1a758de7023a79d8a9b44904caf938e58807fbbe.zip | |
Added mobjinfo/state adjustments for various skill levels. Changed sky
handling. Fixed bug that made you switch to the electric crossbow if you
received poison bolt ammo (you should not switch to anything at all when
this happens). Some more commented-out savegame code added.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2154
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 9e9aea7a..3800d844 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -119,6 +119,8 @@ boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num) // villsa [STRIFE] ammo update // where's the check for grenades? - haleyjd: verified no switch to grenades + // haleyjd 10/03/10: don't change to electric bow when picking up poison + // arrows. if(!player->readyweapon) { switch(ammo) @@ -129,7 +131,6 @@ boolean P_GiveAmmo(player_t* player, ammotype_t ammo, int num) break; case am_elecbolts: - case am_poisonbolts: if(player->weaponowned[wp_elecbow]) player->pendingweapon = wp_elecbow; break; |