summaryrefslogtreecommitdiff
path: root/src/strife/p_inter.c
diff options
context:
space:
mode:
authorJames Haley2011-02-26 06:00:37 +0000
committerJames Haley2011-02-26 06:00:37 +0000
commitc16a0065efd2296533b5f165631be24ac55e2a44 (patch)
tree1d8a29a829564bb7bf4bbe69e69be88eb15f87f3 /src/strife/p_inter.c
parent8de669ac9b3d53144e201abf62982d0e31d56940 (diff)
downloadchocolate-doom-c16a0065efd2296533b5f165631be24ac55e2a44.tar.gz
chocolate-doom-c16a0065efd2296533b5f165631be24ac55e2a44.tar.bz2
chocolate-doom-c16a0065efd2296533b5f165631be24ac55e2a44.zip
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
Diffstat (limited to 'src/strife/p_inter.c')
-rw-r--r--src/strife/p_inter.c6
1 files 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;