[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.247,1.248 messages.h,1.254,1.255 npcm

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/planeshift/planeshift/src/common/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13456/src/common/net

Modified Files:
	messages.cpp messages.h npcmessages.cpp npcmessages.h 
Log Message:
CS_ID->uint.


Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** messages.cpp	2 Mar 2005 20:48:40 -0000	1.247
--- messages.cpp	7 Mar 2005 14:26:12 -0000	1.248
***************
*** 1097,1103 ****
  // ---------------------------------------------------------------------------
  
! psDisconnectMessage::psDisconnectMessage(uint32_t clientnum,CS_ID actorid, const char *reason)
  {
!     msg = new MsgEntry( sizeof(CS_ID) + strlen(reason) + 1 );
  
      msg->SetType(MSGTYPEDISCONNECT);
--- 1097,1103 ----
  // ---------------------------------------------------------------------------
  
! psDisconnectMessage::psDisconnectMessage(uint32_t clientnum,uint actorid, const char *reason)
  {
!     msg = new MsgEntry( sizeof(uint) + strlen(reason) + 1 );
  
      msg->SetType(MSGTYPEDISCONNECT);
***************
*** 1127,1133 ****
  
  
! psUserActionMessage::psUserActionMessage(uint32_t clientnum,CS_ID target,const char *action, const char *dfltBehaviors)
  {
!     msg = new MsgEntry( strlen(action) + 1 + strlen(dfltBehaviors) + 1 + sizeof(CS_ID) );
  
      msg->SetType(MSGTYPEUSERACTION);
--- 1127,1133 ----
  
  
! psUserActionMessage::psUserActionMessage(uint32_t clientnum,uint target,const char *action, const char *dfltBehaviors)
  {
!     msg = new MsgEntry( strlen(action) + 1 + strlen(dfltBehaviors) + 1 + sizeof(uint) );
  
      msg->SetType(MSGTYPEUSERACTION);
***************
*** 1420,1424 ****
  
  psEquipmentMessage::psEquipmentMessage( uint32_t clientNum,
!                                         CS_ID actorid,
                                          uint32_t type,
                                          int  slot,
--- 1420,1424 ----
  
  psEquipmentMessage::psEquipmentMessage( uint32_t clientNum,
!                                         uint actorid,
                                          uint32_t type,
                                          int  slot,
***************
*** 1427,1431 ****
                                          csString& texture )
  {    
!     msg = new MsgEntry( sizeof(CS_ID)   +
                          sizeof(Command) +
                          sizeof( slot )  +
--- 1427,1431 ----
                                          csString& texture )
  {    
!     msg = new MsgEntry( sizeof(uint)   +
                          sizeof(Command) +
                          sizeof( slot )  +
***************
*** 1864,1870 ****
  
  psGUITargetUpdateMessage::psGUITargetUpdateMessage(uint32_t client_num,
!                                                    CS_ID target_id)
  {
!     msg = new MsgEntry(sizeof(uint32_t) + sizeof(CS_ID));
  
      msg->SetType(MSGTYPEGUITARGETUPDATE);
--- 1864,1870 ----
  
  psGUITargetUpdateMessage::psGUITargetUpdateMessage(uint32_t client_num,
!                                                    uint target_id)
  {
!     msg = new MsgEntry(sizeof(uint32_t) + sizeof(uint));
  
      msg->SetType(MSGTYPEGUITARGETUPDATE);
***************
*** 2417,2421 ****
                                  const char* texParts, 
                                  const char* equipmentParts,
!                                 CS_ID mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove,
                                  bool dead,
                                  uint32_t playerID,
--- 2417,2421 ----
                                  const char* texParts, 
                                  const char* equipmentParts,
!                                 uint mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove,
                                  bool dead,
                                  uint32_t playerID,
***************
*** 3023,3027 ****
  }
  
! psDRMessage::psDRMessage(uint32_t client,CS_ID mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove)
  {
      linmove->GetDRData(on_ground,speed,pos,yrot,sector,vel,ang_vel);
--- 3023,3027 ----
  }
  
! psDRMessage::psDRMessage(uint32_t client,uint mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove)
  {
      linmove->GetDRData(on_ground,speed,pos,yrot,sector,vel,ang_vel);
***************
*** 3037,3041 ****
  }
  
! psDRMessage::psDRMessage(uint32_t client,CS_ID mappedid,
                           bool on_ground,float speed,
                           csVector3& pos,float yrot,iSector *sector,
--- 3037,3041 ----
  }
  
! psDRMessage::psDRMessage(uint32_t client,uint mappedid,
                           bool on_ground,float speed,
                           csVector3& pos,float yrot,iSector *sector,
***************
*** 3053,3057 ****
  }
  
! void psDRMessage::WriteDRInfo(uint32_t client,CS_ID mappedid,
                          bool on_ground,float speed,
                          csVector3& pos,float yrot,iSector *sector,
--- 3053,3057 ----
  }
  
! void psDRMessage::WriteDRInfo(uint32_t client,uint mappedid,
                          bool on_ground,float speed,
                          csVector3& pos,float yrot,iSector *sector,

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.254
retrieving revision 1.255
diff -C2 -d -r1.254 -r1.255
*** messages.h	3 Mar 2005 09:28:29 -0000	1.254
--- messages.h	7 Mar 2005 14:26:13 -0000	1.255
***************
*** 687,694 ****
  {
  public:
!     CS_ID actor;
      csString msgReason;
  
!     psDisconnectMessage(uint32_t clientnum,CS_ID actorid,const char *reason);
      psDisconnectMessage(MsgEntry *message);
  };
--- 687,694 ----
  {
  public:
!     uint actor;
      csString msgReason;
  
!     psDisconnectMessage(uint32_t clientnum,uint actorid,const char *reason);
      psDisconnectMessage(MsgEntry *message);
  };
***************
*** 697,705 ****
  {
  public:
!     CS_ID target;
      csString action;
      csString dfltBehaviors;
  
!     psUserActionMessage(uint32_t clientnum,CS_ID target,const char *action, const char *dfltBehaviors="");
      psUserActionMessage(MsgEntry *message);
  };
--- 697,705 ----
  {
  public:
!     uint target;
      csString action;
      csString dfltBehaviors;
  
!     psUserActionMessage(uint32_t clientnum,uint target,const char *action, const char *dfltBehaviors="");
      psUserActionMessage(MsgEntry *message);
  };
***************
*** 1033,1037 ****
       */
      psEquipmentMessage( uint32_t clientNum,
!                         CS_ID actorid,
                          uint32_t type,
                          int slot,
--- 1033,1037 ----
       */
      psEquipmentMessage( uint32_t clientNum,
!                         uint actorid,
                          uint32_t type,
                          int slot,
***************
*** 1372,1380 ****
       * @param targetName  Name of the new target to display.
       */
!     psGUITargetUpdateMessage(uint32_t client_num, CS_ID target_id);
      psGUITargetUpdateMessage(MsgEntry *message);
  
      uint32_t clientNum;
!     CS_ID targetID;
  };
  
--- 1372,1380 ----
       * @param targetName  Name of the new target to display.
       */
!     psGUITargetUpdateMessage(uint32_t client_num, uint target_id);
      psGUITargetUpdateMessage(MsgEntry *message);
  
      uint32_t clientNum;
!     uint targetID;
  };
  
***************
*** 1569,1573 ****
  {
  protected:
!     void WriteDRInfo(uint32_t client,CS_ID mappedid,
                      bool on_ground,float speed,
                      csVector3& pos,float yrot,iSector *sector,
--- 1569,1573 ----
  {
  protected:
!     void WriteDRInfo(uint32_t client,uint mappedid,
                      bool on_ground,float speed,
                      csVector3& pos,float yrot,iSector *sector,
***************
*** 1586,1594 ****
      csString sectorName;  /// Name of the sector
      float ang_vel;   /// Angular velocity of Yrot member changing
!     CS_ID entityid;  /// The mapped id of the entity in question
  
      psDRMessage() { }
!     psDRMessage(uint32_t client,CS_ID mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove);
!     psDRMessage(uint32_t client,CS_ID mappedid,
                  bool on_ground,float speed,
                  csVector3& pos,float yrot,iSector *sector,
--- 1586,1594 ----
      csString sectorName;  /// Name of the sector
      float ang_vel;   /// Angular velocity of Yrot member changing
!     uint entityid;  /// The mapped id of the entity in question
  
      psDRMessage() { }
!     psDRMessage(uint32_t client,uint mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove);
!     psDRMessage(uint32_t client,uint mappedid,
                  bool on_ground,float speed,
                  csVector3& pos,float yrot,iSector *sector,
***************
*** 1649,1653 ****
                      const char* texParts,
                      const char* equipmentParts,
!                     CS_ID mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove,
                      bool dead,
                      uint32_t playerID = 0, uint32_t groupID = 0 );
--- 1649,1653 ----
                      const char* texParts,
                      const char* equipmentParts,
!                     uint mappedid,csStringHash* msgstrings, iPcLinearMovement *linmove,
                      bool dead,
                      uint32_t playerID = 0, uint32_t groupID = 0 );

Index: npcmessages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/npcmessages.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** npcmessages.cpp	3 Feb 2005 21:31:40 -0000	1.14
--- npcmessages.cpp	7 Mar 2005 14:26:13 -0000	1.15
***************
*** 142,146 ****
  }
  
! void psAllEntityPosMessage::Add(CS_ID id, csVector3& pos, iSector*& sector, csStringHash* msgstrings)
  {
      msg->Add((uint32_t)id);
--- 142,146 ----
  }
  
! void psAllEntityPosMessage::Add(uint id, csVector3& pos, iSector*& sector, csStringHash* msgstrings)
  {
      msg->Add((uint32_t)id);
***************
*** 159,163 ****
  }
  
! void psAllEntityPosMessage::Get(CS_ID& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine)
  {
      id = msg->GetUInt32();
--- 159,163 ----
  }
  
! void psAllEntityPosMessage::Get(uint& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine)
  {
      id = msg->GetUInt32();

Index: npcmessages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/npcmessages.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** npcmessages.h	29 Dec 2004 00:14:40 -0000	1.16
--- npcmessages.h	7 Mar 2005 14:26:13 -0000	1.17
***************
*** 147,154 ****
  
      /// Add a new entity's position to the data buffer
!     void Add(CS_ID id, csVector3& pos, iSector*& sector, csStringHash* msgstrings);
  
      /// Get the next entity and position from the buffer
!     void Get(CS_ID& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine);
  };
  
--- 147,154 ----
  
      /// Add a new entity's position to the data buffer
!     void Add(uint id, csVector3& pos, iSector*& sector, csStringHash* msgstrings);
  
      /// Get the next entity and position from the buffer
!     void Get(uint& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine);
  };

[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.247,1.248 messages.h,1.254,1.255 npcm

[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.247,1.248 messages.h,1.254,1.255 npcmessages.cpp,1.14,1.15 npcmessages.h,1.16,1.17