Merge lp:~epsy/armagetronad/trunk-referee into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Yann Kaiser]

[Yann Kaiser (epsy)]

This branch sets two new vote types: referee and demotereferee
The first one will promote someone to access level 6 (one access level better than team leader, one worse than Armatrator), the other will cancel it.

Also:
* Added OP/DEOP as console commands. Use with care.
* Fixed voter/nonvoter counts being wrong after a vote.
* Fixed a MIN_VOTERS check requiring MIN_VOTERS + 1 voters.
* Fixed the fact a vote could be started with less than 2 voters present.
* Fixed the "vote accepted" message being shown after executing the vote instead of the opposite.

=== modified file 'NEWS'
--- NEWS	2009-04-30 12:36:02 +0000
+++ NEWS	2009-07-30 01:34:06 +0000
@@ -7,6 +7,8 @@
 - New setting SILENCE_ENEMIES (boolean). When enabled, chat sent from enemies
   is not displayed on your client if you are alive. If you are dead all chat
   is displayed.
+- New console commands OP and DEOP replicate the functionnality of chat commands /op and /deop
+- New vote: /callvote referee <player>: Elevates <player> to access level 6. /callvote demotereferee reverts.
 
 Changes since 0.3.0
 ===================

=== modified file 'config/settings_authentication.cfg'
--- config/settings_authentication.cfg	2008-04-25 18:00:53 +0000
+++ config/settings_authentication.cfg	2009-07-30 01:30:54 +0000
@@ -140,6 +140,8 @@
 #                       powerful as the owner himself.
 # 2      Moderator      A server moderator. Is still allowed to use /admin,
 #                       but is restricted to player management commands.
+# 6      Referee        For organized matches, can be elected to use team and
+#                       match management commands.
 # 7      Team Leader    Leader of a team. By default, no admin rights at all.
 # 8      Team Member    Member of a team. Local team accounts get this level.
 # 12     Local User     Players with local accounts get this level.

=== modified file 'language/english_base.txt'
--- language/english_base.txt	2009-04-30 12:36:02 +0000
+++ language/english_base.txt	2009-07-30 01:30:54 +0000
@@ -1653,6 +1653,11 @@
 suspend_player_details_text			If accepted, \1 will be suspended for some rounds.
 suspend_player_text					Suspend \1
 
+referee_player_details_text         If accepted, \1 will be made referee: He will be able to administrate teams.
+referee_player_text                 Make \1 referee
+demotereferee_player_details_text   If accepted, \1 won't be referee anymore: He will not be able to administrate teams.
+demotereferee_player_text           Demote \1 as referee
+
 vote_include_details_text			If accepted, the file \1 will be included as a configuration file.
 vote_include_text					Include \1
 vote_include_error					Include file \1 not found or not readable.\n
@@ -2429,6 +2434,11 @@
 player_noshuffle        Your shuffling wish has no effect.\n
 player_shuffle_error    /shuffle expects a number as argument; an explicit sign (+/-) will change your position by the indicated number of steps, no sign will shuffle you to the given position.\n
 
+player_referee          0x7fff7fBy order of \10x7fff7f, \20x7fff7f is now a referee.\n
+player_referee_anon     \10x7fff7f is now a referee.\n
+player_referee_nomore   0xff7f7fBy order of \10xff7f7f, \20xff7f7f is no longer a referee.\n
+player_referee_nomore_anon \1 0xff7f7fis no longer a referee.\n
+
 player_message_help     Sends a message to a specified player.
 player_message_usage    Usage: PLAYER_MESSAGE <user ID or name> "<Message>"\n
 kick_usage              Usage: KICK <user ID or name> <Reason>\n
@@ -2659,6 +2669,8 @@
 vote_vote_against					\1 voted against Poll "\2".\n
 vote_unknown_command                Unknown /vote command \1, available are: \2\n
 vote_kick_local                     Can't vote against local player/AI \1.\n
+vote_referee_already                \10xRESETT is already a referee.\n
+vote_demotereferee_notref           \10xRESETT is not a referee.\n
 
 #********************************************
 #********************************************
@@ -2810,6 +2822,7 @@
 config_accesslevel_1        Administrator
 config_accesslevel_2        Moderator
 config_accesslevel_5        Armatrator
+config_accesslevel_6        Referee
 config_accesslevel_7        Team Leader
 config_accesslevel_8        Team Member
 config_accesslevel_12       Local User
@@ -2932,7 +2945,9 @@
 access_level_op_unclear     \1: User is already logged in, please explicitly set an access level.\n
 
 access_level_demote         \1 has been demoted to "\2" by order of \3.\n
+access_level_demote_anon    \1 has been demoted to "\2".\n
 access_level_promote        \1 has been promoted to "\2" by order of \3.\n
+access_level_promote_anon   \1 has been promoted to "\2".\n
 
 access_level_admin_denied   0xff7f7f/admin denied,0xffffff insufficient access level.\n
 access_level_shuffle_up_denied Required access level to shuffle up is "\1", you only have "\2".\n

=== modified file 'language/english_base_notranslate.txt'
--- language/english_base_notranslate.txt	2009-03-02 13:40:05 +0000
+++ language/english_base_notranslate.txt	2009-07-30 01:30:54 +0000
@@ -253,7 +253,6 @@
 
 config_accesslevel_3        Moderator-2
 config_accesslevel_4        Moderator-3
-config_accesslevel_6        Armatrator-2
 config_accesslevel_9        Recruit
 config_accesslevel_10       Recruit-1
 config_accesslevel_11       Recruit-2

=== modified file 'src/engine/ePlayer.cpp'
--- src/engine/ePlayer.cpp	2009-04-30 12:36:02 +0000
+++ src/engine/ePlayer.cpp	2009-07-30 01:30:54 +0000
@@ -2282,6 +2282,7 @@
     if ( !victim->IsHuman() )
     {
         sn_ConsoleOut( tOutput( "$access_level_op_denied_ai", command ), admin->Owner() );
+        return;
     }
 
     victim->Authenticate( authName, accessLevel, admin );
@@ -2325,6 +2326,170 @@
     }
 }
 
+// Changes the access level of a player, from console or other anonymous sources
+// and which is not to be called when you can call an OPFUNC
+// This isn't meant to be an user command, rather a simple switch between promoting and logging in, so make necessary checks yourself
+void se_AnonOp( ePlayerNetID * victim, tAccessLevel accessLevel, bool messages=true )
+{
+    if ( !victim->IsHuman() )
+    {
+        return;
+    }
+
+    if ( victim->IsAuthenticated() )
+    {
+        if ( accessLevel > tAccessLevel_Authenticated )
+        {
+            accessLevel = tAccessLevel_Authenticated;
+        }
+
+        tAccessLevel oldAccessLevel = victim->GetAccessLevel();
+        victim->SetAccessLevel( accessLevel );
+
+
+        if ( accessLevel < oldAccessLevel && messages )
+        {
+            se_SecretConsoleOut( tOutput( "$access_level_promote_anon",
+                                          victim->GetLogName(),
+                                          tCurrentAccessLevel::GetName( accessLevel )
+                                            ), victim, &se_Hide, 0, 0, &se_CanHide );
+        }
+        else if ( accessLevel > oldAccessLevel && messages )
+        {
+            se_SecretConsoleOut( tOutput( "$access_level_demote_anon",
+                                 victim->GetLogName(),
+                                 tCurrentAccessLevel::GetName( accessLevel )
+                                        ), victim, &se_Hide, 0, 0, &se_CanHide );
+        }
+    }
+    else
+    {
+        tString authName = victim->GetUserName() + "@L_OP";
+        if ( victim->IsAuthenticated() )
+        {
+            authName = victim->GetRawAuthenticatedName();
+        }
+
+        victim->Authenticate( authName, accessLevel, 0, messages );
+    }
+}
+
+// Console command for it
+void se_OpConf( std::istream &s )
+{
+    if ( se_NeedsServer( "OP", s ) )
+    {
+        return;
+    }
+
+    ePlayerNetID * victim = se_FindPlayerInChatCommand( 0, "OP", s );
+    bool isexplicit = false;
+
+    if ( victim )
+    {
+        // read optional access level, this part is merly a copypaste from the /shuffle code
+        int level = se_opAccessLevelMax;
+        if ( victim->IsAuthenticated() )
+        {
+            level = victim->GetAccessLevel();
+        }
+        char first;
+        s >> first;
+        if ( !s.eof() && !s.fail() )
+        {
+            isexplicit = true;
+            s.unget();
+            int newLevel = 0;
+            s >> newLevel;
+
+            if ( first == '+' || first == '-' )
+            {
+                level += newLevel;
+            }
+            else
+            {
+                level = newLevel;
+            }
+        }
+
+        s >> level;
+
+        tAccessLevel accessLevel;
+        accessLevel = static_cast< tAccessLevel >( level );
+
+        if ( accessLevel == victim->GetAccessLevel() )
+        {
+            if ( isexplicit )
+            {
+                sn_ConsoleOut( tOutput( "$access_level_op_same", "OP" ), 0 );
+            }
+            else
+            {
+                sn_ConsoleOut( tOutput( "$access_level_op_unclear", "OP" ), 0 );
+            }
+        }
+        else
+        {
+            se_AnonOp( victim, accessLevel );
+        }
+    }
+
+}
+
+static tConfItemFunc se_opConf( "OP", &se_OpConf );
+static tAccessLevelSetter se_opConfLevel( se_opConf, tAccessLevel_Owner );
+
+void se_AnonDeOp( ePlayerNetID * victim, bool messages=true )
+{
+    if ( victim->IsAuthenticated() )
+    {
+        victim->DeAuthenticate( 0, messages );
+    }
+}
+void se_DeOpConf( std::istream &s )
+{
+    if ( se_NeedsServer( "DEOP", s ) )
+    {
+        return;
+    }
+
+    ePlayerNetID * victim = se_FindPlayerInChatCommand( 0, "DEOP", s );
+
+    if ( victim )
+    {
+        se_AnonDeOp( victim, true );
+    }
+}
+
+static tConfItemFunc se_deOpConf( "DEOP", &se_DeOpConf );
+static tAccessLevelSetter se_deOpConfLevel( se_deOpConf, tAccessLevel_Owner );
+
+void se_MakeReferee( ePlayerNetID * victim, ePlayerNetID * admin )
+{
+    se_AnonOp( victim, tAccessLevel_Referee, false );
+    if ( admin )
+    {
+        sn_ConsoleOut( tOutput( "$player_referee", admin->GetColoredName(), victim->GetColoredName() ) );
+    }
+    else
+    {
+        sn_ConsoleOut( tOutput( "$player_referee_anon", victim->GetColoredName() ) );
+    }
+}
+
+void se_CancelReferee( ePlayerNetID * victim, ePlayerNetID * admin )
+{
+    se_AnonDeOp( victim, false );
+    if ( admin )
+    {
+        sn_ConsoleOut( tOutput( "$player_referee_nomore", admin->GetColoredName(), victim->GetColoredName() ) );
+    }
+    else
+    {
+        sn_ConsoleOut( tOutput( "$player_referee_nomore_anon", victim->GetColoredName() ) );
+    }
+}
+
 // minimal access level for /team management
 static tAccessLevel se_teamAccessLevel = tAccessLevel_TeamLeader;
 static tSettingItem< tAccessLevel > se_teamAccessLevelConf( "ACCESS_LEVEL_TEAM", se_teamAccessLevel );
@@ -5116,7 +5281,7 @@
     }
 }
 
-void ePlayerNetID::Authenticate( tString const & authName, tAccessLevel accessLevel_, ePlayerNetID const * admin )
+void ePlayerNetID::Authenticate( tString const & authName, tAccessLevel accessLevel_, ePlayerNetID const * admin, bool messages )
 {
     tString newAuthenticatedName( se_EscapeName( authName ).c_str() );
 
@@ -5162,28 +5327,30 @@
             SetAccessLevel( accessLevel_ );
         }
 
-        tString order( "" );
-        if ( admin )
-        {
-            order = tOutput( "$login_message_byorder",
-                             admin->GetLogName() );
-        }
-
-        if ( IsHuman() )
-        {
-            if ( GetAccessLevel() != tAccessLevel_Default )
-            {
-                se_SecretConsoleOut( tOutput( "$login_message_special",
-                                              GetName(),
-                                              newAuthenticatedName,
-                                              tCurrentAccessLevel::GetName( GetAccessLevel() ),
-                                              order ), this, &se_Hide, admin, 0, &se_CanHide );
-            }
-            else
-            {
-                se_SecretConsoleOut( tOutput( "$login_message", GetName(), newAuthenticatedName, order ), this, &se_Hide, admin, 0, &se_CanHide );
-            }
-
+        if ( messages )
+        {
+            tString order( "" );
+            if ( admin )
+            {
+                order = tOutput( "$login_message_byorder",
+                                 admin->GetLogName() );
+            }
+
+            if ( IsHuman() )
+            {
+                if ( GetAccessLevel() != tAccessLevel_Remote )
+                {
+                    se_SecretConsoleOut( tOutput( "$login_message_special",
+                                                  GetName(),
+                                                  newAuthenticatedName,
+                                                  tCurrentAccessLevel::GetName( GetAccessLevel() ),
+                                                  order ), this, &se_Hide, admin, 0, &se_CanHide );
+                }
+                else
+                {
+                    se_SecretConsoleOut( tOutput( "$login_message", GetName(), newAuthenticatedName, order ), this, &se_Hide, admin, 0, &se_CanHide );
+                }
+            }
         }
     }
 
@@ -5193,14 +5360,14 @@
     UpdateName();
 }
 
-void ePlayerNetID::DeAuthenticate( ePlayerNetID const * admin ){
+void ePlayerNetID::DeAuthenticate( ePlayerNetID const * admin, bool messages ){
     if ( IsAuthenticated() )
     {
-        if ( admin )
+        if ( admin && messages )
         {
             se_SecretConsoleOut( tOutput( "$logout_message_deop", GetName(), GetFilteredAuthenticatedName(), admin->GetLogName() ), this, &se_Hide, admin, 0, &se_CanHide );
         }
-        else
+        else if ( messages )
         {
             se_SecretConsoleOut( tOutput( "$logout_message", GetName(), GetFilteredAuthenticatedName() ), this, &se_Hide, 0, 0, &se_CanHide );
         }

=== modified file 'src/engine/ePlayer.h'
--- src/engine/ePlayer.h	2009-04-03 22:40:46 +0000
+++ src/engine/ePlayer.h	2009-07-30 01:30:54 +0000
@@ -319,8 +319,9 @@
 #ifdef KRAWALL_SERVER
     void Authenticate( tString const & authName, 
                        tAccessLevel accessLevel = tAccessLevel_Authenticated,
-                       ePlayerNetID const * admin = 0 );    //!< make the authentification valid
-    void DeAuthenticate( ePlayerNetID const * admin = 0 );  //!< make the authentification invalid
+                       ePlayerNetID const * admin = 0,
+                       bool messages = true );    //!< make the authentification valid
+    void DeAuthenticate( ePlayerNetID const * admin = 0, bool messages = true );  //!< make the authentification invalid
     bool IsAuthenticated() const;                     //!< is the authentification valid?
 #endif
 
@@ -534,6 +535,9 @@
 
 void ForceName ( std::istream & s );
 
+void se_MakeReferee( ePlayerNetID * victim, ePlayerNetID * admin = 0 );
+void se_CancelReferee( ePlayerNetID * victim, ePlayerNetID * admin = 0 );
+
 // ******************************************************************************************
 // *
 // *	GetNameFromClient

=== modified file 'src/engine/eVoter.cpp'
--- src/engine/eVoter.cpp	2009-04-03 22:40:46 +0000
+++ src/engine/eVoter.cpp	2009-07-30 01:30:54 +0000
@@ -100,7 +100,15 @@
 static int se_votingBiasSuspend = 0;
 static tSettingItem< int > se_vbSuspend( "VOTING_BIAS_SUSPEND", se_votingBiasSuspend );
 
-// the number set here always acts as additional votes against a suspend vote.
+// the number set here always acts as additional votes against a referee vote.
+static int se_votingBiasReferee = 0;
+static tSettingItem< int > se_vbReferee( "VOTING_BIAS_REFEREE", se_votingBiasReferee );
+
+// the number set here always acts as additional votes against a demotereferee vote.
+static int se_votingBiasCancelReferee = 0;
+static tSettingItem< int > se_vbCancelReferee( "VOTING_BIAS_DEMOTEREFEREE", se_votingBiasCancelReferee );
+
+// the number set here always acts as additional votes against a include vote.
 static int se_votingBiasInclude = 0;
 static tSettingItem< int > se_vbInclude( "VOTING_BIAS_INCLUDE", se_votingBiasInclude );
 
@@ -143,6 +151,17 @@
 static tSettingItem< tAccessLevel > se_accessLevelVoteSuspendSI( "ACCESS_LEVEL_VOTE_SUSPEND", se_accessLevelVoteSuspend );
 static tAccessLevelSetter se_accessLevelVoteSuspendSILevel( se_accessLevelVoteSuspendSI, tAccessLevel_Owner );
 
+// minimal access level for referee votes
+static tAccessLevel se_accessLevelVoteReferee = tAccessLevel_Moderator;
+static tSettingItem< tAccessLevel > se_accessLevelVoteRefereeSI( "ACCESS_LEVEL_VOTE_REFEREE", se_accessLevelVoteReferee );
+static tAccessLevelSetter se_accessLevelVoteRefereeSILevel( se_accessLevelVoteRefereeSI, tAccessLevel_Owner );
+
+// minimal access level for demotereferee votes
+static tAccessLevel se_accessLevelVoteCancelReferee = tAccessLevel_Moderator;
+static tSettingItem< tAccessLevel > se_accessLevelVoteCancelRefereeSI( "ACCESS_LEVEL_VOTE_DEMOTEREFEREE", se_accessLevelVoteCancelReferee );
+static tAccessLevelSetter se_accessLevelVoteCancelRefereeSILevel( se_accessLevelVoteCancelRefereeSI, tAccessLevel_Owner );
+
+
 // minimal access level for include votes
 static tAccessLevel se_accessLevelVoteInclude = tAccessLevel_Moderator;
 static tSettingItem< tAccessLevel > se_accessLevelVoteIncludeSI( "ACCESS_LEVEL_VOTE_INCLUDE", se_accessLevelVoteInclude );
@@ -363,7 +382,7 @@
         }
 
         // enough voters online?
-        if ( eVoter::voters_.Len() < se_minVoters )
+        if ( eVoter::voters_.Len() < se_minVoters || eVoter::voters_.Len() < 2 )
         {
             tOutput message("$vote_toofew");
             sn_ConsoleOut( message, senderID );
@@ -519,7 +538,7 @@
         if ( sn_GetNetState() == nSERVER )
         {
             // see if there are enough voters
-            if ( total <= se_minVoters )
+            if ( total < se_minVoters || total < 2 )
             {
                 this->BroadcastMessage( tOutput("$vote_toofew") );
                 delete this;
@@ -553,9 +572,9 @@
 
                 tOutput voteMessage;
                 voteMessage.SetTemplateParameter( 1, GetDescription() );
-                voteMessage.SetTemplateParameter( 2, pro-1 );
-                voteMessage.SetTemplateParameter( 3, con-se_votingBias );
-                voteMessage.SetTemplateParameter( 4, total-se_votingBias);
+                voteMessage.SetTemplateParameter( 2, pro );
+                voteMessage.SetTemplateParameter( 3, con-bias );
+                voteMessage.SetTemplateParameter( 4, total-pro-con+bias );
                 voteMessage << "$vote_rejected";
                 this->BroadcastMessage( voteMessage );
                 delete this;
@@ -565,14 +584,14 @@
             // see if the vote has been accepted
             if ( pro >= con && pro * 2 > total )
             {
+                tOutput voteMessage;
+                voteMessage.SetTemplateParameter( 1, GetDescription() );
+                voteMessage.SetTemplateParameter( 2, pro );
+                voteMessage.SetTemplateParameter( 3, con-bias );
+                voteMessage.SetTemplateParameter( 4, total-pro-con+bias );
+                voteMessage << "$vote_accepted";
+                this->BroadcastMessage( voteMessage );
                 this->DoExecute();
-                tOutput voteMessage;
-                voteMessage.SetTemplateParameter( 1, GetDescription() );
-                voteMessage.SetTemplateParameter( 2, pro-1 );
-                voteMessage.SetTemplateParameter( 3, con-se_votingBias );
-                voteMessage.SetTemplateParameter( 4, total-se_votingBias);
-                voteMessage << "$vote_accepted";
-                this->BroadcastMessage( voteMessage );
                 delete this;
                 return;
             }
@@ -1681,8 +1700,110 @@
     tAccessLevel level_; //!< the level to execute the file with
 };
 
+class eVoteItemReferee: public eVoteItemHarmServerControlled
+{
+public:
+    eVoteItemReferee( ePlayerNetID* player = 0 )
+    : eVoteItemHarm( player )
+    {}
+
+    ~eVoteItemReferee()
+    {}
+protected:
+    // get the language string prefix
+    virtual char const * DoGetPrefix() const{ return "referee"; }
+
+    // access level required for this kind of vote
+    virtual tAccessLevel DoGetAccessLevel() const
+    {
+        return se_accessLevelVoteReferee;
+    }
+
+    virtual bool DoCheckValid( int senderID )
+    {
+        if ( !eVoteItemHarm::DoCheckValid( senderID ) )
+            return false;
+
+        ePlayerNetID * victim = GetPlayer();
+        if ( victim->GetAccessLevel() <= tAccessLevel_Referee )
+        {
+            sn_ConsoleOut( tOutput("$vote_referee_already", victim->GetColoredName() ), senderID );
+            return false;
+        }
+
+        return true;
+    }
+
+    // return vote-specific extra bias
+    virtual int DoGetExtraBias() const
+    {
+        return se_votingBiasReferee;
+    }
+    virtual void DoExecute()                        // called when the voting was successful
+    {
+        ePlayerNetID * player = GetPlayer();
+        if ( player )
+        {
+            se_MakeReferee ( player );
+        }
+    }
+
+};
+
+class eVoteItemCancelReferee: public eVoteItemHarmServerControlled
+{
+public:
+    eVoteItemCancelReferee( ePlayerNetID* player = 0 )
+    : eVoteItemHarm( player )
+    {}
+
+    ~eVoteItemCancelReferee()
+    {}
+protected:
+    // get the language string prefix
+    virtual char const * DoGetPrefix() const{ return "demotereferee"; }
+
+    // access level required for this kind of vote
+    virtual tAccessLevel DoGetAccessLevel() const
+    {
+        return se_accessLevelVoteReferee;
+    }
+
+    virtual bool DoCheckValid( int senderID )
+    {
+        if ( !eVoteItemHarm::DoCheckValid( senderID ) )
+            return false;
+
+        ePlayerNetID * victim = GetPlayer();
+        if ( victim->GetAccessLevel() != tAccessLevel_Referee )
+        {
+            sn_ConsoleOut( tOutput("$vote_demotereferee_notref", victim->GetColoredName() ), senderID );
+            return false;
+        }
+
+        return true;
+    }
+
+    // return vote-specific extra bias
+    virtual int DoGetExtraBias() const
+    {
+        return se_votingBiasCancelReferee;
+    }
+    virtual void DoExecute()                        // called when the voting was successful
+    {
+        ePlayerNetID * player = GetPlayer();
+        if ( player )
+        {
+            se_CancelReferee ( player );
+        }
+    }
+
+};
+
 #endif
 
+
+
 // **************************************************************************************
 // **************************************************************************************
 
@@ -2168,6 +2289,30 @@
             item = tNEW( eVoteItemInclude )( file, p->GetAccessLevel() );
         }
     }
+    else if ( command == "referee" )
+    {
+        tString name;
+        name.ReadLine( message );
+        ePlayerNetID * toMakeReferee = ePlayerNetID::FindPlayerByName( name, p );
+
+        if ( toMakeReferee )
+        {
+            // accept message
+            item = tNEW( eVoteItemReferee )( toMakeReferee );
+        }
+    }
+    else if ( command == "demotereferee" )
+    {
+        tString name;
+        name.ReadLine( message );
+        ePlayerNetID * toDemoteReferee = ePlayerNetID::FindPlayerByName( name, p );
+
+        if ( toDemoteReferee )
+        {
+            // accept message
+            item = tNEW( eVoteItemCancelReferee )( toDemoteReferee );
+        }
+    }
     else if ( command == "command" )
     {
         tString console;
@@ -2181,9 +2326,9 @@
     else
     {
 #ifdef KRAWALL_SERVER
-        sn_ConsoleOut( tOutput("$vote_unknown_command", command, "suspend, kick, include, command" ), p->Owner() );
+        sn_ConsoleOut( tOutput("$vote_unknown_command", command, "command, demotereferee, include, kick, referee, suspend" ), p->Owner() );
 #else
-        sn_ConsoleOut( tOutput("$vote_unknown_command", command, "suspend, kick" ), p->Owner() );
+        sn_ConsoleOut( tOutput("$vote_unknown_command", command, "kick, suspend" ), p->Owner() );
 #endif
     }
 

=== modified file 'src/tools/tConfiguration.h'
--- src/tools/tConfiguration.h	2009-04-01 23:32:45 +0000
+++ src/tools/tConfiguration.h	2009-07-30 01:30:54 +0000
@@ -50,7 +50,7 @@
     tAccessLevel_3 = 3,            // reserved
     tAccessLevel_4 = 4,            // reserved
     tAccessLevel_Armatrator = 5,   // reserved
-    tAccessLevel_6 = 6,            // reserved
+    tAccessLevel_Referee = 6,      // a referee elected by players
     tAccessLevel_TeamLeader = 7,   // a team leader
     tAccessLevel_TeamMember = 8,   // a team member
     tAccessLevel_9 = 9,            // reserved