Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r af45c72387f5 src/chat.cpp
- --- a/src/chat.cpp Sat Jul 27 09:47:16 2013 +0200
- +++ b/src/chat.cpp Wed Jul 31 11:33:52 2013 +0300
- @@ -106,6 +106,7 @@
- EXTERN_CVAR( Int, con_colorinmessages );
- EXTERN_CVAR( Int, chat_sound );
- +EXTERN_CVAR( Int, msglevel )
- //*****************************************************************************
- FStringCVar *g_ChatMacros[10] =
- @@ -464,7 +465,8 @@
- Printf( ulChatLevel, "%s\n", OutString.GetChars() );
- // [BB] If the user doesn't want to see the messages, they shouldn't make a sound.
- - if ( show_messages )
- + // [Dusk] Also do not play the sound if the msglevel CVar filters this.
- + if ( show_messages && ( msglevel <= ulChatLevel ))
- {
- // [RC] User can choose the chat sound.
- if ( chat_sound == 1 ) // Default
- diff -r af45c72387f5 src/m_options.cpp
- --- a/src/m_options.cpp Sat Jul 27 09:47:16 2013 +0200
- +++ b/src/m_options.cpp Wed Jul 31 11:33:52 2013 +0300
- @@ -1166,7 +1166,11 @@
- static value_t MessageLevels[] = {
- { 0.0, "Item Pickup" },
- { 1.0, "Obituaries" },
- - { 2.0, "Critical Messages" }
- + { 2.0, "Critical Messages" },
- +
- + // [Dusk] Added chat and team chat here
- + { 3.0, "Chat Messages" },
- + { 4.0, "Team Chat Messages" },
- };
- static value_t MessageColorLevels[] = {
- @@ -1188,7 +1192,7 @@
- { discrete, "Show messages", {&show_messages}, {2.0}, {0.0}, {0.0}, {OnOff} },
- { discrete, "Show obituaries", {&show_obituaries}, {2.0}, {0.0}, {0.0}, {OnOff} },
- { discrete, "Chat sound", {&chat_sound}, {4.0}, {0.0}, {0.0}, {ChatSounds} },
- - { discrete, "Minimum message level",{&msglevel}, {3.0}, {0.0}, {0.0}, {MessageLevels} },
- + { discrete, "Minimum message level",{&msglevel}, {5.0}, {0.0}, {0.0}, {MessageLevels} },
- { discrete, "Center messages", {&con_centernotify}, {2.0}, {0.0}, {0.0}, {OnOff} },
- { discrete, "Color in messages", {&con_colorinmessages}, {3.0}, {0.0}, {0.0}, {MessageColorLevels} },
- { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement