diff --git a/config/menu_voicecom_v2.cfg b/config/menu_voicecom_v2.cfg index 925f886a..b5386f34 100644 --- a/config/menu_voicecom_v2.cfg +++ b/config/menu_voicecom_v2.cfg @@ -30,7 +30,7 @@ newmenu "Team Replies" 1 1 // the following two mirror F1/F2 - disagree/agree genvcitem [Yes Affirmative "All right, Sir"] "yes affirmative allrightsir" 1 // # genvcitem ["Negative" "No can do" "There's no way, Sir!"] "negative nocando theresnowaysir" 2 // * -genvcitem ["under way" "on the move"] "underway onthemove" 3 +genvcitem ["Under way" "On the move"] "underway onthemove" 3 genvcitem "Got your back!" goturback 4 genvcitem "In Position!" inposition 5 @@ -57,10 +57,9 @@ genvcitem "I'm on your team, man!" imonyourteamman // V 5 [ 1,2,3 ] newmenu "Team Tactics" 1 1 genvcitem "Cover me!" coverme 1 -//genvcitem "Stay together!" staytogether 2 -genvcitem "Stay here!" stayhere 2 -genvcitem "Report In!" reportin 3 -// 4 // * +genvcitem "Stay together!" staytogether 2 +genvcitem "Stay here!" stayhere 3 +genvcitem "Report In!" reportin 4 // * // V 6 [ 1,2,3 ] newmenu "Public Talk" 1 1 diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 0cd64ca7..1fd22ffa 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -561,6 +561,12 @@ menuitemcheckbox "Stay together: " "(soundmuted 83)" "mutesound 83 (! menuitemcheckbox "There's no way sir: " "(soundmuted 84)" "mutesound 84 (! $arg1)" menuitemcheckbox "We did it!: " "(soundmuted 85)" "mutesound 85 (! $arg1)" menuitemcheckbox "Yes: " "(soundmuted 86)" "mutesound 86 (! $arg1)" -menuitemcheckbox "Nice shot: " "(soundmuted 87)" "mutesound 87 (! $arg1)" - +menuitemcheckbox "Under way: " "(soundmuted 87)" "mutesound 87 (! $arg1)" +menuitemcheckbox "On the move: " "(soundmuted 88)" "mutesound 88 (! $arg1)" +menuitemcheckbox "Got your back: " "(soundmuted 89)" "mutesound 89 (! $arg1)" +menuitemcheckbox "In position: " "(soundmuted 90)" "mutesound 90 (! $arg1)" +menuitemcheckbox "Report In!: " "(soundmuted 91)" "mutesound 91 (! $arg1)" +menuitemcheckbox "Nice shot: " "(soundmuted 92)" "mutesound 92 (! $arg1)" +menuitemcheckbox "Thanks: " "(soundmuted 93)" "mutesound 93 (! $arg1)" +menuitemcheckbox "Awesome: " "(soundmuted 94)" "mutesound 94 (! $arg1)" diff --git a/config/sounds.cfg b/config/sounds.cfg index f822c28e..23370e22 100755 --- a/config/sounds.cfg +++ b/config/sounds.cfg @@ -97,7 +97,14 @@ registersound "voicecom/staytogether" // 83 registersound "voicecom/theresnowaysir" // 84 registersound "voicecom/wedidit" // 85 registersound "voicecom/yes" // 86 -registersound "voicecom/niceshot" // 87 +registersound "voicecom/underway" // 87 +registersound "voicecom/onthemove" // 88 +registersound "voicecom/goturback" // 89 +registersound "voicecom/inposition" // 90 +registersound "voicecom/reportin" // 91 +registersound "voicecom/niceshot" // 92 : public +registersound "voicecom/thanks" // 93 : public +registersound "voicecom/awesome" // 94 : public // Music registermusic "pingpong/03-pp-kamikadze" // M_FLAGGRAB diff --git a/source/src/audiomanager.cpp b/source/src/audiomanager.cpp index 424dfc91..f1edeaa3 100644 --- a/source/src/audiomanager.cpp +++ b/source/src/audiomanager.cpp @@ -409,9 +409,9 @@ void voicecom(char *sound, char *text) { defformatstring(soundpath)("voicecom/%s", sound); int s = audiomgr.findsound(soundpath, 0, gamesounds); - if(s < 0 || s < S_AFFIRMATIVE || s > S_NICESHOT) return; + if(s < 0 || s < S_AFFIRMATIVE || s > S_AWESOME) return; audiomgr.playsound(s, SP_HIGH); - if(s == S_NICESHOT) // public + if(s >= S_NICESHOT) // public { addmsg(SV_VOICECOM, "ri", s); toserver(text); diff --git a/source/src/sound.h b/source/src/sound.h index 58b28d5c..82b38d8e 100644 --- a/source/src/sound.h +++ b/source/src/sound.h @@ -55,7 +55,14 @@ enum S_THERESNOWAYSIR, S_WEDIDIT, S_YES, - S_NICESHOT, + S_UNDERWAY, + S_ONTHEMOVE, + S_GOTURBACK, + S_INPOSITION, + S_REPORTIN, + S_NICESHOT, // begin: public + S_THANKS, + S_AWESOME, S_NULL };