diff options
| author | James Haley | 2010-09-22 08:07:35 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-22 08:07:35 +0000 |
| commit | 8bbfd5b68a289ddf933f78d369606f1f22dd91c6 (patch) | |
| tree | 573d605ca3a394cdf8ac15395a7fee4d4cf5c944 /src/strife/p_inter.c | |
| parent | 3d8f10ef325d2d03f1f9535d9f201eca3d56d37f (diff) | |
| download | chocolate-doom-8bbfd5b68a289ddf933f78d369606f1f22dd91c6.tar.gz chocolate-doom-8bbfd5b68a289ddf933f78d369606f1f22dd91c6.tar.bz2 chocolate-doom-8bbfd5b68a289ddf933f78d369606f1f22dd91c6.zip | |
Rewrote P_GiveItemToPlayer to exactly match binary, particularly with
treatment of SPR_TOKN objects, and playing proper sounds for different
item types. Fixed most S_StartSound calls in the menu engine. Removed
call to S_StopSound in S_StartSound, as Strife doesn't do it. Added call
to P_DialogDoChoice(-1) in M_Responder when menuindialog is asserted and
the menu exit key is pressed.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2130
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 8f770c2e..07d5d411 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -418,7 +418,7 @@ void P_TouchSpecialThing(mobj_t* special, mobj_t* toucher) if(delta > toucher->height || delta < -8*FRACUNIT) return; // out of reach - sound = sfx_itemup; + sound = sfx_itemup; player = toucher->player; // Dead thing touching. |