Thread: [Armagetronad-commits] SF.net SVN: armagetronad: [7210] armagetronad/branches/0.2.8/armagetronad

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 7210
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7210&view=rev
Author:   wrtlprnft
Date:     2007-04-23 10:50:46 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
- Added ALLOW_TEAM_CHANGES setting to lock the teams for tournaments and the like
- Added (DIS)?ALLOW_TEAM_CHANGES_PLAYER command to specifically (dis)allow a player from switching teams
- Localized the error message you get if you say /teamleave on a server with AUTO_TEAM 0

Modified Paths:
--------------
    armagetronad/branches/0.2.8/armagetronad/NEWS
    armagetronad/branches/0.2.8/armagetronad/language/english_base.txt
    armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp
    armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.h

Modified: armagetronad/branches/0.2.8/armagetronad/NEWS
===================================================================

--- armagetronad/branches/0.2.8/armagetronad/NEWS	2007-04-22 15:04:00 UTC (rev 7209)
+++ armagetronad/branches/0.2.8/armagetronad/NEWS	2007-04-23 17:50:46 UTC (rev 7210)
@@ -27,6 +27,8 @@
   doublebinders get while not punishing players who press both left and
   right at the same time.
 - LAG_O_METER(TRESHOLD|BLEND|USE_OLD): Configure the minimal size of the Lag-O-Meter, its color and whether to scrap it all and stick with the old one.
+- ALLOW_TEAM_CHANGE: if set to 0 players won't be able to join a team, create a new team or change to another team.
+- ALLOW_TEAM_CHANGE_PLAYER/DISALLOW_TEAM_CHANGE_PLAYER: allow/disallow specific players to switch teams
 
   Featurelets:
 - The client now can hadle network traffic while it is waiting for the graphics

Modified: armagetronad/branches/0.2.8/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/language/english_base.txt	2007-04-22 15:04:00 UTC (rev 7209)
+++ armagetronad/branches/0.2.8/armagetronad/language/english_base.txt	2007-04-23 17:50:46 UTC (rev 7210)
@@ -358,6 +358,7 @@
 spam_maxlen_help					Maximal length of chat message.
 spam_autokick_help					Spam score that causes you to get kicked instantly.
 silence_all_help					If set to 1, all chat messages will be omitted.
+allow_team_change_help				If set to 1, all players can change teams. If set to 0, players can only change teams if they've been specifically allowed to by ALLOW_TEAM_CHANGE_PLAYER
 
 # spam kick messages
 spam_chat                   You chatted too much.
@@ -790,6 +791,8 @@
 kill_help                   Kill a specific player (as warning before a kick)
 silence_help                Silence a specific player so he can't use public chat any more (/msg and /team still work)
 voice_help                  Reverse of SILENCE
+allow_team_change_player_help Allow a specific player to change teams even if ALLOW_TEAM_CHANGE is disabled
+disallow_team_change_player_help Reverse of ALLOW_TEAM_CHANGE_PLAYER
 kick_help					Kicks the specified player from the server.
 ban_help                    Bans the specified player from the server (kicks him first) for a variable time in minutes.
 ban_ip_help                 Bans the spedified IP address from the server for a variable time.
@@ -2043,6 +2046,8 @@
 #********************************************
 #********************************************
 
+player_teamleave_disallowed Sorry, does not work with automatic team assignment.\n
+player_teamchanges_disallowed Sorry, the administrator disabled team changes.\n
 player_pingcharity_changed	Ping charity changed from \1 to \2.\n
 spam_protection_repeat  SPAM PROTECTION: you already said: \1\n
 spam_protection			SPAM PROTECTION: you are silenced for the next \1 seconds.\n
@@ -2050,6 +2055,8 @@
 spam_protection_silenced SPAM PROTECTION: you have been silenced by the server administrator.\n
 player_silenced         \10xff7777 has been silenced.\n
 player_voiced           \10x77ff77 has been given his voice back.\n
+player_allowed_teamchange \10x77ff77 has been allowed to change his team.\n
+player_disallowed_teamchange \10xff7777 cannot change teams anymore.\n
 vote_spam_protection	VOTE SPAM PROTECTION: you are disallowed from issuing votes for the next \1 seconds.\n
 chat_title_text			Say:
 player_entered_game		\1 0x7fff7fentered the game.\n

Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp	2007-04-22 15:04:00 UTC (rev 7209)
+++ armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp	2007-04-23 17:50:46 UTC (rev 7210)
@@ -62,6 +62,9 @@
 static bool se_assignTeamAutomatically = true;
 static tSettingItem< bool > se_assignTeamAutomaticallyConf( "AUTO_TEAM", se_assignTeamAutomatically );
 
+static bool se_allowTeamChanges = true;
+static tSettingItem< bool > se_allowTeamChangesConf( "ALLOW_TEAM_CHANGE", se_allowTeamChanges );
+
 static tReferenceHolder< ePlayerNetID > se_PlayerReferences;
 
 class PasswordStorage
@@ -1345,9 +1348,13 @@
                 else if (command == "/teamleave") {
                     if ( se_assignTeamAutomatically )
                     {
-                        sn_ConsoleOut("Sorry, does not work with automatic team assignment.\n", p->Owner() );
+                        sn_ConsoleOut(tOutput("$player_teamleave_disallowed"), p->Owner() );
                         return;
                     }
+                    if(!p->TeamChangeAllowed()) {
+                        sn_ConsoleOut(tOutput("$player_disallowed_teamchange"), p->Owner() );
+                        return;
+                    }
 
                     eTeam * leftTeam = p->NextTeam();
                     if ( leftTeam )
@@ -1958,8 +1965,7 @@
 
 static nSpamProtectionSettings se_chatSpamSettings( 1.0f, "SPAM_PROTECTION_CHAT", tOutput("$spam_protection") );
 
-ePlayerNetID::ePlayerNetID(int p):nNetObject(),listID(-1), teamListID(-1)
-        ,registeredMachine_(0), pID(p),chatSpam_( se_chatSpamSettings )
+ePlayerNetID::ePlayerNetID(int p):nNetObject(),listID(-1), teamListID(-1), allowTeamChange_(false), registeredMachine_(0), pID(p),chatSpam_( se_chatSpamSettings )
 {
     favoriteNumberOfPlayersPerTeam = 1;
 
@@ -2024,7 +2030,7 @@
 
 
 ePlayerNetID::ePlayerNetID(nMessage &m):nNetObject(m),listID(-1), teamListID(-1)
-        , registeredMachine_(0), chatSpam_( se_chatSpamSettings )
+        , allowTeamChange_(false), registeredMachine_(0), chatSpam_( se_chatSpamSettings )
 {
     greeted     =false;
     chatting_   =false;
@@ -3207,7 +3213,7 @@
             ePlayerNetID* player = se_PlayerNetIDs(i);
 
             // only assign new team if it is possible
-            if ( player->NextTeam() != player->CurrentTeam() &&
+            if ( player->TeamChangeAllowed() && player->NextTeam() != player->CurrentTeam() &&
                     ( !player->NextTeam() || player->NextTeam()->PlayerMayJoin( player ) )
                )
             {
@@ -3225,7 +3231,7 @@
                 ePlayerNetID* player = se_PlayerNetIDs(i);
 
                 // if the player is not currently on a team, but wants to join a specific team, let it join any, but keep the wish stored
-                if ( player->NextTeam() && !player->CurrentTeam() )
+                if ( player->TeamChangeAllowed() && player->NextTeam() && !player->CurrentTeam() )
                 {
                     eTeam * wish = player->NextTeam();
                     bool assignBack = se_assignTeamAutomatically;
@@ -3253,6 +3259,12 @@
             // announce unfullfilled wishes
             if ( player->NextTeam() != player->CurrentTeam() && player->NextTeam() )
             {
+                //if the player can't change teams delete the team wish
+                if(!player->TeamChangeAllowed()) {
+                    player->SetTeam( player->CurrentTeam() );
+                    continue;
+                }
+
                 tOutput message( "$player_joins_team_wish",
                                  player->GetName(),
                                  player->NextTeam()->Name() );
@@ -3635,11 +3647,15 @@
 // * team management *
 // *******************
 
+bool ePlayerNetID::TeamChangeAllowed() const {
+    return se_allowTeamChanges || allowTeamChange_;
+}
+
 // put a new player into a default team
 void ePlayerNetID::FindDefaultTeam( )
 {
     // only the server should do this, the client does not have the full information on how to do do it right.
-    if ( sn_GetNetState() == nCLIENT || !se_assignTeamAutomatically || spectating_ )
+    if ( sn_GetNetState() == nCLIENT || !se_assignTeamAutomatically || spectating_ || !TeamChangeAllowed() )
         return;
 
     static bool recursion = false;
@@ -3770,6 +3786,11 @@
     // check if the team change is legal
     tASSERT ( nCLIENT !=  sn_GetNetState() );
 
+    if(!TeamChangeAllowed()) {
+        sn_ConsoleOut(tOutput("$player_teamchanges_disallowed"));
+        return;
+    }
+
     if ( !eTeam::NewTeamAllowed() ||
             ( bool( currentTeam ) && ( currentTeam->NumHumanPlayers() == 1 ) ) ||
             IsSpectating() )
@@ -3865,6 +3886,11 @@
 
             m >> newTeam;
 
+            if(!TeamChangeAllowed()) {
+                sn_ConsoleOut( tOutput( "$player_teamchanges_disallowed" ), Owner() );
+                break;
+            }
+
             // annihilate team if it no longer is in the game
             if ( bool(newTeam) && newTeam->TeamID() < 0 )
                 newTeam = 0;
@@ -4065,7 +4091,7 @@
 
 static ePlayerNetID * ReadPlayer( std::istream & s, char const * error )
 {
-    // read name of player to be killed
+    // read name of player to be returned
     tString name;
     name.ReadLine( s );
     int num = name.toInt();
@@ -4074,7 +4100,7 @@
     {
         ePlayerNetID* p = se_PlayerNetIDs(i);
 
-        // check whether it's p who should be killed,
+        // check whether it's p who should be returned,
         // either by comparing the owner or the name.
         bool itsHim = false;
         if ( num > 0 )
@@ -4738,4 +4764,19 @@
     }
 }
 
-
+static void se_allowTeamChangesPlayer(bool allow, std::istream &s) {
+    ePlayerNetID * p = ReadPlayer( s, "$network_kick_notfound" );
+    if ( p )
+    {
+        sn_ConsoleOut( tOutput( (allow ? "$player_allowed_teamchange" : "$player_disallowed_teamchange"), p->GetName() ) );
+        p->TeamChangeAllowed( allow );
+    }
+}
+static void se_allowTeamChangesPlayer(std::istream &s) {
+    se_allowTeamChangesPlayer(true, s);
+}
+static void se_disallowTeamChangesPlayer(std::istream &s) {
+    se_allowTeamChangesPlayer(false, s);
+}
+static tConfItemFunc se_allowTeamChangesPlayerConf("ALLOW_TEAM_CHANGE_PLAYER", &se_allowTeamChangesPlayer);
+static tConfItemFunc se_disallowTeamChangesPlayerConf("DISALLOW_TEAM_CHANGE_PLAYER", &se_disallowTeamChangesPlayer);

Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.h
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.h	2007-04-22 15:04:00 UTC (rev 7209)
+++ armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.h	2007-04-23 17:50:46 UTC (rev 7210)
@@ -144,6 +144,7 @@
     bool			spectating_; //!< are we currently spectating? Spectators don't get assigned to teams.
     bool			chatting_;   //!< are we currently chatting?
     int				chatFlags_;  //!< different types of reasons for beeing chatting
+    bool			allowTeamChange_; //!< allow team changes even if ALLOW_TEAM_CHANGE is disabled?
 
     //For improved remoteadmin
     bool            loggedIn;       //Is this user logged in?
@@ -193,6 +194,8 @@
     bool IsSpectating() const { return spectating_; }
 
     // team management
+    bool TeamChangeAllowed() const; //!< is this player allowed to change teams?
+    void TeamChangeAllowed(bool allowed) {allowTeamChange_ = allowed;} //!< set if this player should always be allowed to change teams
     eTeam* NextTeam()    const { return nextTeam; }				// return the team I will be next round
     eTeam* CurrentTeam() const { return currentTeam; }		// return the team I am in
     int  TeamListID() const { return teamListID; }		// return my position in the team


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Armagetronad-commits] SF.net SVN: armagetronad: [7210] armagetronad/branches/0.2.8/armagetronad

armagetronad-commits