summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorJames Haley2010-09-06 21:22:27 +0000
committerJames Haley2010-09-06 21:22:27 +0000
commit6e288cc74b53b65c495f2a8a7cf518464bdbf645 (patch)
tree58ffaef013cf2d6ea71fdf80a063739bd552d8e1 /src/strife
parenteda4d7be63c6b5e1bf9ae10c8ed762b9e7a549dc (diff)
downloadchocolate-doom-6e288cc74b53b65c495f2a8a7cf518464bdbf645.tar.gz
chocolate-doom-6e288cc74b53b65c495f2a8a7cf518464bdbf645.tar.bz2
chocolate-doom-6e288cc74b53b65c495f2a8a7cf518464bdbf645.zip
Comment fix, and enabled player's extreme death sound.
Subversion-branch: /branches/strife-branch Subversion-revision: 2020
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_enemy.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index f3899ff3..0acf15dd 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -1339,7 +1339,7 @@ void A_StalkerThink(mobj_t* actor)
//
// [STRIFE] New function
// haleyjd 09/06/10: Action function to marshall transitions to the
-// Sentinel's spawnstate.
+// Stalker's spawnstate.
//
void A_StalkerSetLook(mobj_t* actor)
{
@@ -2042,16 +2042,16 @@ void A_BossDeath (mobj_t* mo)
void A_PlayerScream (mobj_t* mo)
{
// Default death sound.
- int sound = sfx_pldeth;
-
+ int sound = sfx_pldeth;
+
if ( (gamemode == commercial)
- && (mo->health < -50))
+ && (mo->health < -50))
{
- // IF THE PLAYER DIES
- // LESS THAN -50% WITHOUT GIBBING
- sound = sfx_swish; // villsa [STRIFE] TODO - fix sounds
+ // IF THE PLAYER DIES
+ // LESS THAN -50% WITHOUT GIBBING
+ sound = sfx_plxdth; // villsa [STRIFE] different sound
}
-
+
S_StartSound (mo, sound);
}