| Révision | 768c267cf2a999ffbdd4d2f08647c5bd87d31914 (tree) |
|---|---|
| l'heure | 2021-10-17 14:15:52 |
| Auteur | Adam Kaminski <kaminskiadam9@gmai...> |
| Commiter | Adam Kaminski |
Spectators can no longer send private messages to the server while the chat is restricted.
src/chat.cpp (diff) src/sv_commands.cpp (diff) src/sv_main.cpp (diff)| @@ -787,8 +787,10 @@ | ||
| 787 | 787 | { |
| 788 | 788 | if ( g_ulChatMode != CHATMODE_PRIVATE_SEND ) |
| 789 | 789 | note += "Players cannot hear you chat"; |
| 790 | - else if (( g_ulChatPlayer != MAXPLAYERS ) && ( players[g_ulChatPlayer].bSpectating == false )) | |
| 791 | - note.AppendFormat( "%s " TEXTCOLOR_GRAY "cannot hear you chat", players[g_ulChatPlayer].userinfo.GetName()); | |
| 790 | + else if ( g_ulChatPlayer == MAXPLAYERS ) | |
| 791 | + note += "The server cannot hear you chat"; | |
| 792 | + else if ( players[g_ulChatPlayer].bSpectating == false ) | |
| 793 | + note.AppendFormat( "%s " TEXTCOLOR_GRAY "cannot hear you chat", players[g_ulChatPlayer].userinfo.GetName() ); | |
| 792 | 794 | else bDrawNote = false; |
| 793 | 795 | } |
| 794 | 796 | else |
| @@ -1077,8 +1077,19 @@ | ||
| 1077 | 1077 | // |
| 1078 | 1078 | void SERVERCOMMANDS_PrivateSay( ULONG ulSender, ULONG ulReceiver, const char *pszString, bool bForbidChatToPlayers, ULONG ulPlayerExtra, ServerCommandFlags flags ) |
| 1079 | 1079 | { |
| 1080 | - if ( ulSender != MAXPLAYERS && PLAYER_IsValidPlayer( ulSender ) == false ) | |
| 1081 | - return; | |
| 1080 | + if ( ulSender != MAXPLAYERS ) | |
| 1081 | + { | |
| 1082 | + if ( PLAYER_IsValidPlayer( ulSender ) == false ) | |
| 1083 | + return; | |
| 1084 | + | |
| 1085 | + // [AK] Spectators cannot send private messages to the server or non-spectators when the chat is restricted. | |
| 1086 | + if (( bForbidChatToPlayers ) && (( ulReceiver == MAXPLAYERS ) || ( players[ulReceiver].bSpectating == false ))) | |
| 1087 | + { | |
| 1088 | + SERVER_PrintfPlayer( ulSender, "You can't send any private messages to %s right now.\n", | |
| 1089 | + ( ulReceiver == MAXPLAYERS ) ? "the server" : players[ulReceiver].userinfo.GetName() ); | |
| 1090 | + return; | |
| 1091 | + } | |
| 1092 | + } | |
| 1082 | 1093 | |
| 1083 | 1094 | ServerCommands::PlayerSay command; |
| 1084 | 1095 | command.SetMessage( pszString ); |
| @@ -1086,13 +1097,6 @@ | ||
| 1086 | 1097 | // [AK] First send the command to the player receiving the message. |
| 1087 | 1098 | if ( ulReceiver != MAXPLAYERS ) |
| 1088 | 1099 | { |
| 1089 | - if (( bForbidChatToPlayers ) && ( players[ulReceiver].bSpectating == false )) | |
| 1090 | - { | |
| 1091 | - SERVER_PrintfPlayer( ulSender, "You can't send any private messages to %s right now.\n", | |
| 1092 | - players[ulReceiver].userinfo.GetName() ); | |
| 1093 | - return; | |
| 1094 | - } | |
| 1095 | - | |
| 1096 | 1100 | // [AK] Don't send the command if the sender is supposed to be ignoring the player who receives the message. |
| 1097 | 1101 | if (( ulSender != MAXPLAYERS ) && ( SERVER_GetPlayerIgnoreTic( ulSender, SERVER_GetClient( ulReceiver )->Address ) != 0 )) |
| 1098 | 1102 | { |
| @@ -1191,9 +1191,16 @@ | ||
| 1191 | 1191 | GAMEMODE_HandleEvent( GAMEEVENT_CHAT, 0, ulPlayer != MAXPLAYERS ? ulPlayer : -1, ulMode - CHATMODE_GLOBAL ); |
| 1192 | 1192 | } |
| 1193 | 1193 | |
| 1194 | - // [AK] Don't log private messages that aren't sent to/from the server. | |
| 1195 | - if (( ulMode == CHATMODE_PRIVATE_SEND ) && ( ulPlayer != MAXPLAYERS ) && ( ulReceiver != MAXPLAYERS )) | |
| 1196 | - return; | |
| 1194 | + if ( ulMode == CHATMODE_PRIVATE_SEND ) | |
| 1195 | + { | |
| 1196 | + // [AK] Don't log private messages that aren't sent to/from the server. | |
| 1197 | + if (( ulPlayer != MAXPLAYERS ) && ( ulReceiver != MAXPLAYERS )) | |
| 1198 | + return; | |
| 1199 | + | |
| 1200 | + // [AK] Don't log private messages sent by spectators when the chat is restricted. | |
| 1201 | + if (( ulReceiver == MAXPLAYERS ) && ( bForbidChatToPlayers )) | |
| 1202 | + return; | |
| 1203 | + } | |
| 1197 | 1204 | |
| 1198 | 1205 | // [BB] This is to make the lines readily identifiable, necessary |
| 1199 | 1206 | // for MiX-MaN's IRC server control tool for example. |
Fork