[Planeshift-cvs] CVS: planeshift/src/server pscelserver.cpp,1.70,1.71

[Keith F. <ven...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory usw-pr-cvs1:/tmp/cvs-serv875

Modified Files:
	pscelserver.cpp 
Log Message:
Unrelated updates for proximity networking.  More extensive commit on this
later.

Index: pscelserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/pscelserver.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** pscelserver.cpp	28 Jun 2002 05:39:45 -0000	1.70
--- pscelserver.cpp	30 Jun 2002 11:41:56 -0000	1.71
***************
*** 273,278 ****
     
      // Broadcast to other players
!     netpersist->BroadcastEntity(client->GetClientNum(), 
! 	    client->GetEntity());
      usermanager->NotifyBuddies(client->GetName(), true);		
  
--- 273,279 ----
     
      // Broadcast to other players
!     netpersist->BroadcastEntity(client->GetClientNum(), client->GetEntity());
! 
!     // Check for buddy list members
      usermanager->NotifyBuddies(client->GetName(), true);		
  
***************
*** 647,652 ****
          for (int i=0; i<nearlist->GetCount(); i++)
          {
!             iCelEntity *entity = nearlist->Get(i);
!             iPcProximityList* proxlist2 = CEL_QUERY_PROPCLASS(entity->GetPropertyClassList(), 
                                                                iPcProximityList);
              if (!proxlist2)
--- 648,653 ----
          for (int i=0; i<nearlist->GetCount(); i++)
          {
!             iCelEntity *entity2 = nearlist->Get(i);
!             iPcProximityList* proxlist2 = CEL_QUERY_PROPCLASS(entity2->GetPropertyClassList(), 
                                                                iPcProximityList);
              if (!proxlist2)
***************
*** 655,663 ****
              if (proxlist2->GetClientID())  // non-zero means actual player
              {
!                 proxlist->Register(proxlist2->GetClientID(),entity);
              }
              else if (proxlist->GetClientID() )
              {
!                 proxlist->ReverseRegister(entity,proxlist2->GetClientID() );
              }
              proxlist2->DecRef();
--- 656,664 ----
              if (proxlist2->GetClientID())  // non-zero means actual player
              {
!                 proxlist->Register(proxlist2->GetClientID(),entity2);
              }
              else if (proxlist->GetClientID() )
              {
!                 proxlist2->ReverseRegister(entity,proxlist->GetClientID() );
              }
              proxlist2->DecRef();
***************
*** 746,750 ****
      pcproxlist->Initialize(clientID,objectID); // store these for fast access later
  
!     if (!InitProximityList(pcproxlist,entity,500.0,clientID ))
      {
          pcproxlist->DecRef();
--- 747,751 ----
      pcproxlist->Initialize(clientID,objectID); // store these for fast access later
  
!     if (!InitProximityList(pcproxlist,entity,DEF_PROX_DIST,clientID ))
      {
          pcproxlist->DecRef();