Clean up checkargs a little bit

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications.qc

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 2a92e2fc9b955aa1857618ed18a637ce47a595ec..70a7fc1e1e8550c92475521ffab9d4292935276d 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1,6 +1,6 @@
 // ================================================
 //  Unified notification system, written by Samual
-//  Last updated: June, 2013
+//  Last updated: August, 2013
 // ================================================
 
 string Get_Notif_TypeName(float net_type)
@@ -105,15 +105,18 @@ string Notification_CheckArgs(
                
                case NOTIF_TEAM:
                {
-                       if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
+                       if not(teamplay)
+                               { checkargs = sprintf("%sTeamplay not active!", checkargs); }
                        //else if not(client.team) { checkargs = sprintf("%sNo team provided!", checkargs); }
                        break;
                }
                
                case NOTIF_TEAM_EXCEPT:
                {
-                       if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
-                       else if(IS_NOT_A_CLIENT(client)) { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
+                       if not(teamplay)
+                               { checkargs = sprintf("%sTeamplay not active!", checkargs); }
+                       else if(IS_NOT_A_CLIENT(client))
+                               { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
                        break;
                }
                
@@ -1026,21 +1029,6 @@ void Dump_Notifications(float fh, float alsoprint)
                "(You can also set this cvar to 2 to force ALL notifications to be printed to the chatbox)"
        );
        
-       NOTIF_WRITE_HARDCODED(
-               "ctf_capture_verbose", "0",
-               "Show extra information when someone captures a flag"
-       );
-       
-       NOTIF_WRITE_HARDCODED(
-               "ctf_pickup_enemy_verbose", "0",
-               "Show extra information if an enemy picks up a flag"
-       );
-       
-       NOTIF_WRITE_HARDCODED(
-               "ctf_pickup_team_verbose", "0",
-               "Show extra information if a team mate picks up a flag"
-       );
-       
        NOTIF_WRITE_HARDCODED(
                "debug", "0",
                "Print extra debug information on all notification function calls "