[Opentnl-cvs] tnl/zap CTFGame.cpp,1.20,1.21 CTFGame.h,1.7,1.8 gameType.cpp,1.17,1.18 gameType.h,1.8,1.9 soccerGame.cpp,1.3,1.4 soccerGame.h,1.3,1.4

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

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

Modified Files:
	CTFGame.cpp CTFGame.h gameType.cpp gameType.h soccerGame.cpp 
	soccerGame.h 
Log Message:
Added tnlMethodDispatch files
Split RPC argument parsing and dispatch into seperate module
Moved compressed RPC types into tnlTypes.h
Removed StringTableEntry from being able to be transmitted as an argument to RPCs
Added StringTableEntryRef (and typedef) as valid RPC type
Updated all projects to reflect change to StringTableEntryRef

Index: gameType.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/gameType.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gameType.cpp	3 May 2004 22:06:16 -0000	1.17
--- gameType.cpp	6 May 2004 00:33:39 -0000	1.18
***************
*** 404,408 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cAddClient, (StringTableEntry name, bool isMyClient),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 404,408 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cAddClient, (StringTableEntryRef name, bool isMyClient),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
***************
*** 432,436 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cRemoveClient, (StringTableEntry name),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 432,436 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cRemoveClient, (StringTableEntryRef name),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
***************
*** 440,444 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cAddTeam, (StringTableEntry teamName, F32 r, F32 g, F32 b),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 440,444 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cAddTeam, (StringTableEntryRef teamName, F32 r, F32 g, F32 b),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
***************
*** 457,461 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cClientJoinedTeam, (StringTableEntry name, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 457,461 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cClientJoinedTeam, (StringTableEntryRef name, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
***************
*** 511,515 ****
  extern Color gTeamChatColor;
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cDisplayChatMessage, (bool global, StringTableEntry clientName, const char *message),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 511,515 ----
  extern Color gTeamChatColor;
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cDisplayChatMessage, (bool global, StringTableEntryRef clientName, const char *message),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
***************
*** 551,555 ****
  }
  
! TNL_DECLARE_RPC_MEM_ENUM(GameType, MaxPing);
  
  TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cScoreboardUpdate, (const Vector<RangedU32<0, GameType::MaxPing> > &pingTimes, const Vector<Int<24> > &scores),
--- 551,555 ----
  }
  
! TNL_DECLARE_ENUM(GameType::MaxPing);
  
  TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cScoreboardUpdate, (const Vector<RangedU32<0, GameType::MaxPing> > &pingTimes, const Vector<Int<24> > &scores),
***************
*** 566,570 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cKillMessage, (StringTableEntry victim, StringTableEntry killer),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 566,570 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(GameType, s2cKillMessage, (StringTableEntryRef victim, StringTableEntryRef killer),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {

Index: soccerGame.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/soccerGame.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** soccerGame.cpp	3 May 2004 22:06:16 -0000	1.3
--- soccerGame.cpp	6 May 2004 00:33:39 -0000	1.4
***************
*** 164,168 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(SoccerGameType, s2cSoccerScoreMessage, (U32 msgIndex, StringTableEntry clientName, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 164,168 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(SoccerGameType, s2cSoccerScoreMessage, (U32 msgIndex, StringTableEntryRef clientName, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {

Index: CTFGame.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/CTFGame.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CTFGame.cpp	3 May 2004 22:06:16 -0000	1.20
--- CTFGame.cpp	6 May 2004 00:33:39 -0000	1.21
***************
*** 296,300 ****
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(CTFGameType, s2cCTFMessage, (U32 messageIndex, StringTableEntry clientName, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {
--- 296,300 ----
  }
  
! TNL_IMPLEMENT_NETOBJECT_RPC(CTFGameType, s2cCTFMessage, (U32 messageIndex, StringTableEntryRef clientName, U32 teamIndex),
     NetClassGroupGameMask, RPCGuaranteedOrdered, RPCToGhost, 0)
  {

Index: gameType.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/gameType.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gameType.h	3 May 2004 22:06:16 -0000	1.8
--- gameType.h	6 May 2004 00:33:39 -0000	1.9
***************
*** 124,139 ****
     virtual void performProxyScopeQuery(GameObject *scopeObject, GameConnection *connection);
  
!    TNL_DECLARE_RPC(s2cAddTeam, (StringTableEntry teamName, F32 r, F32 g, F32 b));
     TNL_DECLARE_RPC(s2cSetTeamScore, (U32 teamIndex, U32 score));
!    TNL_DECLARE_RPC(s2cAddClient, (StringTableEntry clientName, bool isMyClient));
!    TNL_DECLARE_RPC(s2cRemoveClient, (StringTableEntry clientName));
  
     TNL_DECLARE_RPC(c2sChangeTeams, ());
!    TNL_DECLARE_RPC(s2cClientJoinedTeam, (StringTableEntry clientName, U32 teamIndex));
  
     TNL_DECLARE_RPC(c2sSendChat, (bool global, const char *message));
!    TNL_DECLARE_RPC(s2cDisplayChatMessage, (bool global, StringTableEntry clientName, const char *message));
  
!    TNL_DECLARE_RPC(s2cKillMessage, (StringTableEntry victim, StringTableEntry killer));
     TNL_DECLARE_RPC(s2cScoreboardUpdate, (const Vector<RangedU32<0, MaxPing> > &pingTimes, const Vector<Int<24> > &scores));
  
--- 124,139 ----
     virtual void performProxyScopeQuery(GameObject *scopeObject, GameConnection *connection);
  
!    TNL_DECLARE_RPC(s2cAddTeam, (StringTableEntryRef teamName, F32 r, F32 g, F32 b));
     TNL_DECLARE_RPC(s2cSetTeamScore, (U32 teamIndex, U32 score));
!    TNL_DECLARE_RPC(s2cAddClient, (StringTableEntryRef clientName, bool isMyClient));
!    TNL_DECLARE_RPC(s2cRemoveClient, (StringTableEntryRef clientName));
  
     TNL_DECLARE_RPC(c2sChangeTeams, ());
!    TNL_DECLARE_RPC(s2cClientJoinedTeam, (StringTableEntryRef clientName, U32 teamIndex));
  
     TNL_DECLARE_RPC(c2sSendChat, (bool global, const char *message));
!    TNL_DECLARE_RPC(s2cDisplayChatMessage, (bool global, StringTableEntryRef clientName, const char *message));
  
!    TNL_DECLARE_RPC(s2cKillMessage, (StringTableEntryRef victim, StringTableEntryRef killer));
     TNL_DECLARE_RPC(s2cScoreboardUpdate, (const Vector<RangedU32<0, MaxPing> > &pingTimes, const Vector<Int<24> > &scores));
  

Index: CTFGame.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/CTFGame.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CTFGame.h	2 May 2004 06:27:41 -0000	1.7
--- CTFGame.h	6 May 2004 00:33:39 -0000	1.8
***************
*** 67,71 ****
     };
  
!    TNL_DECLARE_RPC(s2cCTFMessage, (U32 messageIndex, StringTableEntry clientName, U32 teamIndex));
     TNL_DECLARE_CLASS(CTFGameType);
  };
--- 67,71 ----
     };
  
!    TNL_DECLARE_RPC(s2cCTFMessage, (U32 messageIndex, StringTableEntryRef clientName, U32 teamIndex));
     TNL_DECLARE_CLASS(CTFGameType);
  };

Index: soccerGame.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/soccerGame.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** soccerGame.h	3 May 2004 22:06:16 -0000	1.3
--- soccerGame.h	6 May 2004 00:33:39 -0000	1.4
***************
*** 59,63 ****
     };
  
!    TNL_DECLARE_RPC(s2cSoccerScoreMessage, (U32 msgIndex, StringTableEntry clientName, U32 teamIndex));
     TNL_DECLARE_CLASS(SoccerGameType);
  };
--- 59,63 ----
     };
  
!    TNL_DECLARE_RPC(s2cSoccerScoreMessage, (U32 msgIndex, StringTableEntryRef clientName, U32 teamIndex));
     TNL_DECLARE_CLASS(SoccerGameType);
  };