foxygit / doom Log in
commit c16a0065efd2296533b5f165631be24ac55e2a44
Author:     James Haley <haleyjd@hotmail.com>
AuthorDate: Sat Feb 26 06:00:37 2011 +0000
Commit:     James Haley <haleyjd@hotmail.com>
CommitDate: Sat Feb 26 06:00:37 2011 +0000

    Fix for problem of not changing to new Sigil type properly when
    receiving one via P_KillMobj item drops.

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 2280
---
 src/strife/p_inter.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index e2f54adc..b5af6b13 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -997,8 +997,10 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
                     players[i].sigiltype = 4;
             }

-            players[i].weaponowned[wp_sigil] = true;
-            players[i].readyweapon = wp_sigil;
+            // haleyjd 20110225: fixed these two assignments which Watcom munged
+            // up in the assembly by pre-incrementing the pointer into players[]
+            players[i].st_update = true;
+            players[i].pendingweapon = wp_sigil;
         }
         return;