diff options
| author | Tim Angus <tim@ngus.net> | 2006-06-29 18:00:08 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-06-29 18:00:08 +0000 |
| commit | e4d11790a55f620187a6359797128ee6d2c6e930 (patch) | |
| tree | 0ce6ab516bc7ddc490b063a3efbafb493ab9a032 | |
| parent | 9a3d84421ff10ada947dac98376381bb863db12b (diff) | |
* Fix cg_noTaunt
| -rw-r--r-- | src/cgame/cg_event.c | 3 | ||||
| -rw-r--r-- | ui/ingame_options.menu | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index d1e330b9..7050f14d 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -621,7 +621,8 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) case EV_TAUNT: DEBUGNAME( "EV_TAUNT" ); - trap_S_StartSound( NULL, es->number, CHAN_VOICE, CG_CustomSound( es->number, "*taunt.wav" ) ); + if( !cg_noTaunt.integer ) + trap_S_StartSound( NULL, es->number, CHAN_VOICE, CG_CustomSound( es->number, "*taunt.wav" ) ); break; case EV_WATER_TOUCH: diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu index ad75e1b1..53bcc07f 100644 --- a/ui/ingame_options.menu +++ b/ui/ingame_options.menu @@ -161,7 +161,7 @@ name game group optionsGrp type ITEM_TYPE_YESNO - text "Taunts Off:" + text "Taunts Sounds Off:" cvar "cg_noTaunt" rect 90 130 192 15 textalign ITEM_ALIGN_RIGHT |