[Planeshift-cvs] CVS: planeshift/src/client pscelclient.h,1.23,1.24 pscelclient.cpp,1.73,1.74

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

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1:/tmp/cvs-serv27695

Modified Files:
	pscelclient.h pscelclient.cpp 
Log Message:
Added flag to Linmove so it knows when to send DR messages and when
not to.  Engine now sets this when connecting is finished or when the
client disconnects.

Index: pscelclient.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pscelclient.h	14 Jan 2003 04:38:22 -0000	1.23
--- pscelclient.h	25 Jan 2003 20:47:19 -0000	1.24
***************
*** 71,74 ****
--- 71,75 ----
      
      void SetMainActor(iCelEntity* entity);
+ 	void SetPlayerReady(bool flag);
  
      void SendPersist();

Index: pscelclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** pscelclient.cpp	21 Jan 2003 07:03:28 -0000	1.73
--- pscelclient.cpp	25 Jan 2003 20:47:19 -0000	1.74
***************
*** 217,227 ****
          SetWorldEntity(entity);
  
! 	// This BL Prop class doesn't exist until the world is persisted,
! 	// so we have to set the zone to have it only at this point.
! 	zonehandler->SetWorld(psWorld::GetPSWorld(entity));
  
! 	// This loads one or more map files, depending on the 
! 	// sector specified by .extra_str
! 	zonehandler->LoadZones(pmsg.extra_str);
  
          // Request Actor
--- 217,227 ----
          SetWorldEntity(entity);
  
! 		// This BL Prop class doesn't exist until the world is persisted,
! 		// so we have to set the zone to have it only at this point.
! 		zonehandler->SetWorld(psWorld::GetPSWorld(entity));
  
! 		// This loads one or more map files, depending on the 
! 		// sector specified by .extra_str
! 		zonehandler->LoadZones(pmsg.extra_str);
  
          // Request Actor
***************
*** 323,328 ****
          }
          SetMainActor(newactor);
- 	printf("Main actor %s has refcount of %d immediately after persist.\n",
- 	       newactor->GetName(),newactor->GetRefCount() );
  
          Debug1("Received Player list!\n");
--- 323,326 ----
***************
*** 479,482 ****
--- 477,488 ----
  }
  
+ void psCelClient::SetPlayerReady(bool flag)
+ {
+     csRef<iPcLinearMovement> linmove =
+         CEL_QUERY_PROPCLASS (mainActor->GetPropertyClassList(), iPcLinearMovement);
+     CS_ASSERT(linmove);
+ 
+ 	linmove->SetReady(flag);
+ }
  
  void psCelClient::CreateActor()