[Armagetronad-commits] SF.net SVN: armagetronad: [7709] armagetronad/branches/0.2.8-auth/ armagetronad/src/engine/ePlayer.cpp

[<z-...@us...>]

Revision: 7709
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7709&view=rev
Author:   z-man
Date:     2008-01-30 11:00:08 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Spectators invited to exactly one team can now also use /team to chat with the team.

Modified Paths:
--------------
    armagetronad/branches/0.2.8-auth/armagetronad/src/engine/ePlayer.cpp

Modified: armagetronad/branches/0.2.8-auth/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/branches/0.2.8-auth/armagetronad/src/engine/ePlayer.cpp	2008-01-30 11:19:45 UTC (rev 7708)
+++ armagetronad/branches/0.2.8-auth/armagetronad/src/engine/ePlayer.cpp	2008-01-30 19:00:08 UTC (rev 7709)
@@ -1532,7 +1532,7 @@
     tColoredString console;
     console << *sender;
 
-    if (sender->CurrentTeam() == team) {
+    if (sender->CurrentTeam() == team || !sender->CurrentTeam() ) {
         // foo --> Teammates: some message here
         console << tColoredString::ColorString(1,1,.5) << " --> ";
         console << tColoredString::ColorString(team->R(),team->G(),team->B()) << "Teammates";
@@ -2517,7 +2517,7 @@
     tString msg;
     msg.ReadLine( s );
 
-    eTeam *currentTeam = p->CurrentTeam();
+    eTeam *currentTeam = se_GetManagedTeam( p );
     
     if (currentTeam != NULL) // If a player has just joined the game, he is not yet on a team. Sending a /team message will crash the server
     {
@@ -2541,7 +2541,7 @@
             
             if (
                 // well, you have to be a spectator. No spying on the enemy.
-                admin->CurrentTeam() == 0 &&
+                admin->CurrentTeam() == 0 && admin != p &&
                 (
                     // let spectating admins of sufficient rights eavesdrop
                     admin->GetAccessLevel() <=  se_teamSpyAccessLevel ||


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