Merge remote branch 'origin/master' into samual/mutator_ctf

diff --combined qcsrc/server/cl_client.qc
index 7b06576ddf9227cd4723e3157b1358f972719aa0,b68bce6949eb272048cd6594a6e9a7b81b9d2d18..c6566fdffa7d8cbe650d5485abba9b36c44760a2
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -417,6 -417,9 +417,6 @@@ void PutObserverInServer (void
        if(self.vehicle)
            vehicles_exit(VHEF_RELESE);
  
 -      if(self.flagcarried)
 -              DropFlag(self.flagcarried, world, world);
 -
        WaypointSprite_PlayerDead();
  
        if not(g_ca)  // don't reset teams when moving a ca player to the spectators
@@@ -445,7 -448,6 +445,7 @@@
        
        self.classname = "observer";
        self.iscreature = FALSE;
 +      self.teleportable = TELEPORT_SIMPLE;
        self.damagedbycontents = FALSE;
        self.health = -666;
        self.takedamage = DAMAGE_NO;
@@@ -638,6 -640,7 +638,6 @@@ PutClientInServe
  Called when a client spawns in the server
  =============
  */
 -//void() ctf_playerchanged;
  
  void PutClientInServer (void)
  {
@@@ -694,7 -697,6 +694,7 @@@
                self.classname = "player";
                self.wasplayer = TRUE;
                self.iscreature = TRUE;
 +              self.teleportable = TELEPORT_NORMAL;
                self.damagedbycontents = TRUE;
                self.movetype = MOVETYPE_WALK;
                self.solid = SOLID_SLIDEBOX;
@@@ -865,9 -867,6 +865,6 @@@
                //stuffcmd(self, "chase_active 0");
                //stuffcmd(self, "set viewsize $tmpviewsize \n");
  
-               if (autocvar_g_spawnsound)
-                       sound (self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);
- 
                if(g_assault) {
                        if(self.team == assault_attacker_team)
                                centerprint(self, "You are attacking!");
@@@ -919,9 -918,15 +916,12 @@@
                        self.alivetime = time;
  
                antilag_clear(self);
+ 
+               if (autocvar_g_spawnsound)
+                       soundat(world, self.origin, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTN_NORM);
        } else if(self.classname == "observer") {
                PutObserverInServer ();
        }
 -
 -      //if(g_ctf)
 -      //      ctf_playerchanged();
  }
  
  .float ebouncefactor, ebouncestop; // electro's values
@@@ -1335,6 -1340,7 +1335,6 @@@ ClientConnec
  Called when a client connects to the server
  =============
  */
 -//void ctf_clientconnect();
  string ColoredTeamName(float t);
  void DecodeLevelParms (void);
  //void dom_player_join_team(entity pl);
@@@ -1349,7 -1355,7 +1349,7 @@@ void ClientConnect (void
                return;
        }
  
-       if(Ban_MaybeEnforceBan(self))
+       if(Ban_MaybeEnforceBanOnce(self))
                return;
  
        DecodeLevelParms();
@@@ -1506,6 -1512,10 +1506,6 @@@
                if(g_arena)
                        Spawnqueue_Insert(self);
        }
 -      /*else if(g_ctf)
 -      {
 -              ctf_clientconnect();
 -      }*/
  
        attach_entcs();
  
@@@ -1642,6 -1652,8 +1642,6 @@@ void ClientDisconnect (void
        Portal_ClearAll(self);
  
        RemoveGrapplingHook(self);
 -      if(self.flagcarried)
 -              DropFlag(self.flagcarried, world, world);
  
        // Here, everything has been done that requires this player to be a client.
  
@@@ -2504,6 -2516,7 +2504,6 @@@ void SpectatorThink(
        self.flags |= FL_CLIENT | FL_NOTARGET;
  }
  
 -float ctf_usekey();
  void PlayerUseKey()
  {
        if(self.classname != "player")
@@@ -2516,6 -2529,9 +2516,6 @@@
        }
        
        // a use key was pressed; call handlers
 -      if(ctf_usekey())
 -              return;
 -
        MUTATOR_CALLHOOK(PlayerUseKey);
  }
  
@@@ -2529,6 -2545,7 +2529,6 @@@ Called every frame for each client befo
  =============
  */
  .float usekeypressed;
 -void() ctf_setstatus;
  void() nexball_setstatus;
  .float items_added;
  void PlayerPreThink (void)
@@@ -2826,6 -2843,9 +2826,6 @@@
                if(frametime)
                        player_anim();
  
 -              if(g_ctf)
 -                      ctf_setstatus();
 -
                if(g_nexball)
                        nexball_setstatus();
                

diff --combined qcsrc/server/cl_player.qc
index 258d1874b49f2f381ad1d3b42c36b9e9a9166453,db2707fb9e828ae10ce2d437c6dc07fe92f8feea..38ffa98ef4f667624c9449fe31ae571eec17e3e9
--- 1/qcsrc/server/cl_player.qc
--- 2/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@@ -151,7 -151,6 +151,7 @@@ void CopyBody(float keepvelocity
        self.lip = oldself.lip;
        self.colormap = oldself.colormap;
        self.iscreature = oldself.iscreature;
 +      self.teleportable = oldself.teleportable;
        self.damagedbycontents = oldself.damagedbycontents;
        self.angles = oldself.angles;
        self.avelocity = oldself.avelocity;
@@@ -694,6 -693,15 +694,6 @@@ void PlayerDamage (entity inflictor, en
  
                RemoveGrapplingHook(self);
  
 -              if(self.flagcarried)
 -              {
 -                      if(attacker.classname != "player")
 -                              DropFlag(self.flagcarried, self, attacker); // penalty for flag loss by suicide
 -                      else if(attacker.team == self.team)
 -                              DropFlag(self.flagcarried, attacker, attacker); // penalty for flag loss by suicide/teamkill
 -                      else
 -                              DropFlag(self.flagcarried, world, attacker);
 -              }
                Portal_ClearAllLater(self);
  
                if(clienttype(self) == CLIENTTYPE_REAL)
@@@ -803,9 -811,6 +803,6 @@@ float Say(entity source, float teamsay
        entity head;
        float ret;
  
-       if(Ban_MaybeEnforceBan(source))
-               return 0;
- 
        if(!teamsay && !privatesay)
                if(substring(msgin, 0, 1) == " ")
                        msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!)