[Opentnl-cvs] tnl/zap CTFGame.cpp,1.9,1.10 gameType.cpp,1.9,1.10 quickChat.cpp,1.3,1.4

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26796/zap

Modified Files:
	CTFGame.cpp gameType.cpp quickChat.cpp 
Log Message:
added files to mac project file


Index: quickChat.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/quickChat.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** quickChat.cpp	23 Apr 2004 02:10:41 -0000	1.3
--- quickChat.cpp	23 Apr 2004 02:14:29 -0000	1.4
***************
*** 28,32 ****
  #include "glutInclude.h"
  #include "gameType.h"
! 
  namespace Zap
  {
--- 28,32 ----
  #include "glutInclude.h"
  #include "gameType.h"
! #include <ctype.h>
  namespace Zap
  {

Index: gameType.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/gameType.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gameType.cpp	23 Apr 2004 01:49:46 -0000	1.9
--- gameType.cpp	23 Apr 2004 02:14:29 -0000	1.10
***************
*** 244,247 ****
--- 244,248 ----
  {
     S32 clientIndex = findClientIndexByName(name);
+    gGameUserInterface.displayMessage(Color(0.6f, 0.6f, 0.8f), "%s left the game.", name.getString());
     mClientList.erase(clientIndex);
  }

Index: CTFGame.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/CTFGame.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CTFGame.cpp	23 Apr 2004 01:49:46 -0000	1.9
--- CTFGame.cpp	23 Apr 2004 02:14:29 -0000	1.10
***************
*** 202,206 ****
           s2cCTFMessage(CTFMsgReturnFlag, cl.name, theFlag->getTeamIndex());
           theFlag->sendHome();
!          cl.score += Scores::ReturnScore;
        }
        else
--- 202,206 ----
           s2cCTFMessage(CTFMsgReturnFlag, cl.name, theFlag->getTeamIndex());
           theFlag->sendHome();
!          cl.score += ReturnScore;
        }
        else
***************
*** 219,223 ****
                 mountedFlag->dismount();
                 mountedFlag->sendHome();
!                cl.score += Scores::CapScore;
              }
           }
--- 219,223 ----
                 mountedFlag->dismount();
                 mountedFlag->sendHome();
!                cl.score += CapScore;
              }
           }
***************
*** 285,291 ****
        // Punish team killers slightly
        if(mClientList[killerIndex].teamId == mClientList[clientIndex].teamId)
!          mClientList[killerIndex].score -= Scores::KillScore/4;
        else
!          mClientList[killerIndex].score += Scores::KillScore;
  
        s2cKillMessage(mClientList[clientIndex].name, mClientList[killerIndex].name);
--- 285,291 ----
        // Punish team killers slightly
        if(mClientList[killerIndex].teamId == mClientList[clientIndex].teamId)
!          mClientList[killerIndex].score -= KillScore/4;
        else
!          mClientList[killerIndex].score += KillScore;
  
        s2cKillMessage(mClientList[clientIndex].name, mClientList[killerIndex].name);