[Opentnl-cvs] tnl/master main.cpp,1.3,1.4 masterInterface.cpp,1.1,1.2 masterInterface.h,1.1,1.2

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

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

Modified Files:
	main.cpp masterInterface.cpp masterInterface.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: masterInterface.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/master/masterInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** masterInterface.h	20 Apr 2004 04:27:15 -0000	1.1
--- masterInterface.h	6 May 2004 00:33:38 -0000	1.2
***************
*** 85,89 ****
     TNL_DECLARE_RPC(c2mQueryServers, (U32 queryId, U32 regionMask,
        U32 minPlayers, U32 maxPlayers, U32 infoFlags,
!       U32 maxBots, U32 minCPUSpeed, StringTableEntry gameType, StringTableEntry missionType));
  
     /// m2cQueryServersResponse is sent by the master server in response to a c2mQueryServers RPC, to
--- 85,89 ----
     TNL_DECLARE_RPC(c2mQueryServers, (U32 queryId, U32 regionMask,
        U32 minPlayers, U32 maxPlayers, U32 infoFlags,
!       U32 maxBots, U32 minCPUSpeed, StringTableEntryRef gameType, StringTableEntryRef missionType));
  
     /// m2cQueryServersResponse is sent by the master server in response to a c2mQueryServers RPC, to
***************
*** 130,134 ****
     /// and mission types, any player counts and the current info flags.
     TNL_DECLARE_RPC(c2mUpdateServerStatus, (
!       StringTableEntry gameType, StringTableEntry missionType,
        U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags));
  };
--- 130,134 ----
     /// and mission types, any player counts and the current info flags.
     TNL_DECLARE_RPC(c2mUpdateServerStatus, (
!       StringTableEntryRef gameType, StringTableEntryRef missionType,
        U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags));
  };

Index: masterInterface.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/master/masterInterface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** masterInterface.cpp	20 Apr 2004 04:27:15 -0000	1.1
--- masterInterface.cpp	6 May 2004 00:33:38 -0000	1.2
***************
*** 38,42 ****
  TNL_IMPLEMENT_RPC(MasterServerInterface, c2mQueryServers, (U32 queryId, U32 regionMask,
     U32 minPlayers, U32 maxPlayers, U32 infoFlags,
!    U32 maxBots, U32 minCPUSpeed, StringTableEntry gameType, StringTableEntry missionType),
     NetClassGroupMasterMask, RPCGuaranteedOrdered, RPCDirClientToServer, 0) {}
  
--- 38,42 ----
  TNL_IMPLEMENT_RPC(MasterServerInterface, c2mQueryServers, (U32 queryId, U32 regionMask,
     U32 minPlayers, U32 maxPlayers, U32 infoFlags,
!    U32 maxBots, U32 minCPUSpeed, StringTableEntryRef gameType, StringTableEntryRef missionType),
     NetClassGroupMasterMask, RPCGuaranteedOrdered, RPCDirClientToServer, 0) {}
  
***************
*** 67,71 ****
  
  TNL_IMPLEMENT_RPC(MasterServerInterface, c2mUpdateServerStatus, (
!    StringTableEntry gameType, StringTableEntry missionType,
     U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags),
     NetClassGroupMasterMask, RPCGuaranteedOrdered, RPCDirClientToServer, 0) {}
--- 67,71 ----
  
  TNL_IMPLEMENT_RPC(MasterServerInterface, c2mUpdateServerStatus, (
!    StringTableEntryRef gameType, StringTableEntryRef missionType,
     U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags),
     NetClassGroupMasterMask, RPCGuaranteedOrdered, RPCDirClientToServer, 0) {}

Index: main.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/master/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.cpp	27 Apr 2004 23:26:14 -0000	1.3
--- main.cpp	6 May 2004 00:33:38 -0000	1.4
***************
*** 256,260 ****
                  (U32 queryId, U32 regionMask, U32 minPlayers, U32 maxPlayers,
                   U32 infoFlags, U32 maxBots, U32 minCPUSpeed,
!                  StringTableEntry gameType, StringTableEntry missionType)
     )
     {
--- 256,260 ----
                  (U32 queryId, U32 regionMask, U32 minPlayers, U32 maxPlayers,
                   U32 infoFlags, U32 maxBots, U32 minCPUSpeed,
!                  StringTableEntryRef gameType, StringTableEntryRef missionType)
     )
     {
***************
*** 474,478 ****
     // Called to update the status of a game server.
     TNL_DECLARE_RPC_OVERRIDE(c2mUpdateServerStatus, (
!       StringTableEntry gameType, StringTableEntry missionType,
        U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags))
     {
--- 474,478 ----
     // Called to update the status of a game server.
     TNL_DECLARE_RPC_OVERRIDE(c2mUpdateServerStatus, (
!       StringTableEntryRef gameType, StringTableEntryRef missionType,
        U32 botCount, U32 playerCount, U32 maxPlayers, U32 infoFlags))
     {