[Planeshift-cvs] CVS: planeshift/src/client authentclient.cpp,1.82,1.83 pscelclient.cpp,1.217,1.218 pscelclient.h,1.69,1.70 psclientchar.cpp,1.132,1.133

[Jorrit T. <jo...@us...>]

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

Modified Files:
	authentclient.cpp pscelclient.cpp pscelclient.h 
	psclientchar.cpp 
Log Message:
CS_ID->uint.



Index: authentclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/authentclient.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** authentclient.cpp	2 Mar 2005 19:04:33 -0000	1.82
--- authentclient.cpp	7 Mar 2005 14:26:10 -0000	1.83
***************
*** 143,147 ****
              
              // Special case to drop login failure reply from server immediately after we have already logged in.
!             if (dc.actor == 0 || dc.actor == (CS_ID)-1)
              {
                  if (rejectmsg == "")
--- 143,147 ----
              
              // Special case to drop login failure reply from server immediately after we have already logged in.
!             if (dc.actor == 0 || dc.actor == (uint)-1)
              {
                  if (rejectmsg == "")

Index: pscelclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -C2 -d -r1.217 -r1.218
*** pscelclient.cpp	6 Mar 2005 08:12:15 -0000	1.217
--- pscelclient.cpp	7 Mar 2005 14:26:10 -0000	1.218
***************
*** 716,720 ****
  }
  
! GEMClientObject::GEMClientObject( psCelClient* cel, CS_ID id )
  {
      if (!this->cel)
--- 716,720 ----
  }
  
! GEMClientObject::GEMClientObject( psCelClient* cel, uint id )
  {
      if (!this->cel)
***************
*** 988,992 ****
  {
      // send update out
!     CS_ID mappedid = entity->GetID();  // no mapping anymore, IDs are identical
      bool on_ground;
      float speed,yrot,ang_vel;
--- 988,992 ----
  {
      // send update out
!     uint mappedid = entity->GetID();  // no mapping anymore, IDs are identical
      bool on_ground;
      float speed,yrot,ang_vel;

Index: pscelclient.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** pscelclient.h	28 Feb 2005 23:45:58 -0000	1.69
--- pscelclient.h	7 Mar 2005 14:26:11 -0000	1.70
***************
*** 189,193 ****
  public:
      GEMClientObject();
!     GEMClientObject( psCelClient* cel, CS_ID id );
      virtual ~GEMClientObject();
      iCelEntity* GetEntity() { return entity; }
--- 189,193 ----
  public:
      GEMClientObject();
!     GEMClientObject( psCelClient* cel, uint id );
      virtual ~GEMClientObject();
      iCelEntity* GetEntity() { return entity; }

Index: psclientchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psclientchar.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** psclientchar.cpp	22 Feb 2005 18:10:39 -0000	1.132
--- psclientchar.cpp	7 Mar 2005 14:26:11 -0000	1.133
***************
*** 335,339 ****
      targetEffect = 0;
          
!     CS_ID mappedID = 0;
      if (target)
      {
--- 335,339 ----
      targetEffect = 0;
          
!     uint mappedID = 0;
      if (target)
      {