[Planeshift-cvs] CVS: planeshift/src/client authentclient.cpp,1.24,1.25 pscelclient.cpp,1.37,1.38 psengine.cpp,1.170,1.171

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory usw-pr-cvs1:/tmp/cvs-serv29581/src/client

Modified Files:
	authentclient.cpp pscelclient.cpp psengine.cpp 
Log Message:
enabled multi packet combining

Index: authentclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/authentclient.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** authentclient.cpp	21 Apr 2002 12:05:04 -0000	1.24
--- authentclient.cpp	21 Apr 2002 13:42:53 -0000	1.25
***************
*** 142,146 ****
  	    iCelEntity* entity = psengine->GetCelClient()->GetNetPersist()
  		->GetMappedEntity(dc.actor);
!         printf ("Disconnect MESSAGE! ('%s')\n", (entity)?entity->GetName():"NULL Entity");
  
  	    // are we kicked from server?
--- 142,148 ----
  	    iCelEntity* entity = psengine->GetCelClient()->GetNetPersist()
  		->GetMappedEntity(dc.actor);
! 	    if (!entity)
! 		return;
! 	    printf ("Disconnect MESSAGE! ('%s')\n", entity->GetName());
  
  	    // are we kicked from server?

Index: pscelclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** pscelclient.cpp	18 Apr 2002 18:00:26 -0000	1.37
--- pscelclient.cpp	21 Apr 2002 13:42:54 -0000	1.38
***************
*** 132,140 ****
  bool psCelClient::IsReady()
  {
!     return (actor != NULL) && (world != NULL);
  }
  
  void psCelClient::HandleMessage(MsgEntry* me)
  {
      psCelPersistMessage pmsg(me);
  
--- 132,153 ----
  bool psCelClient::IsReady()
  {
!     if (actor == NULL || world == NULL || actors == NULL)
! 	return false;
!     
!     bool rc;
! 
!     iPcInventory* pcinv = CEL_QUERY_PROPCLASS (
! 	    actors->GetPropertyClassList(), iPcInventory);
!     CS_ASSERT(pcinv);
!     
!     rc = pcinv->GetEntityCount() > 0;
!     pcinv->DecRef();
! 
!     return rc;
  }
  
  void psCelClient::HandleMessage(MsgEntry* me)
  {
+     printf ("MSGIN!\n");
      psCelPersistMessage pmsg(me);
  
***************
*** 184,238 ****
              engine->SetCacheManager(NULL); // Make cache manager use ChDir directory
  
! 	    if (requeststatus == 1)
! 	    {	    
!     		printf ("Received entity! While expecting a map!\n");
!             vfs->ChDir(pwd);
!             return;
! 	    }
! 	    iCelEntity* entity = netpersist->ReadEntity(&pmsg);
! 	    if (!entity)
! 	    {
! 	    	printf ("Error while reading entity!\n");
!             vfs->ChDir(pwd);
!             return;
! 	    }
  	    
! 	    if (requeststatus == 0)
! 	    {
! 		    // is it an actor?
! 		    if (!strcmp (entity->GetBehaviour()->GetName(), "actor"))
! 		        AddActor(entity);
! 		    else
! 		        AddEntity(entity);
! 		
! 	    	entity->DecRef();
! 	    }
! 	    else if (requeststatus == 2) // It's the player entity
! 	    {
! 	    	if (actor) 
! 		        actor->DecRef();
! 		    actor = entity;
!     		requeststatus=3;
! 		    printf("Received Player!\n");
! //		    engine->Prepare();
! 	    }
! 	    else if (requeststatus == 3)    // It's the list of players
! 	    {
!     		if (actors) 
! 		        actors->DecRef();
! 		
!             actors = entity;
! 		    requeststatus=0;
! 		    printf("Received Player list!\n");
! //		    engine->Prepare();
! 	    }
  
          // Change directory back to what it was.
!         vfs->ChDir(pwd);
!         vfs->DecRef();
! 
!         // Reset CacheManager for unknown next access of it
!         engine->SetCacheManager(NULL);
! 	    break;
  	}
  	default:
--- 197,251 ----
              engine->SetCacheManager(NULL); // Make cache manager use ChDir directory
  
! 	if (requeststatus == 1)
! 	{	    
! 	    printf ("Received entity! While expecting a map!\n");
! 	    vfs->ChDir(pwd);
! 	    return;
! 	}
! 	iCelEntity* entity = netpersist->ReadEntity(&pmsg);
! 	if (!entity)
! 	{
! 	    printf ("Error while reading entity!\n");
! 	    vfs->ChDir(pwd);
! 	    return;
! 	}
! 	
! 	if (requeststatus == 0)
! 	{
! 	    // is it an actor?
! 	    if (!strcmp (entity->GetBehaviour()->GetName(), "actor"))
! 		AddActor(entity);
! 	    else
! 		AddEntity(entity);
  	    
! 	    entity->DecRef();
! 	}
! 	else if (requeststatus == 2) // It's the player entity
! 	{
! 	    if (actor) 
! 		actor->DecRef();
! 	    actor = entity;
! 	    requeststatus=3;
! 	    printf("Received Player!\n");
! 	    //		    engine->Prepare();
! 	}
!     	else if (requeststatus == 3)    // It's the list of players
! 	{
! 	    if (actors) 
! 		actors->DecRef();
! 	    
! 	    actors = entity;
! 	    requeststatus=0;
! 	    printf("Received Player list!\n");
! 	    //		    engine->Prepare();
! 	}
  
          // Change directory back to what it was.
! 	vfs->ChDir(pwd);
! 	vfs->DecRef();
! 	
! 	// Reset CacheManager for unknown next access of it
! 	engine->SetCacheManager(NULL);
!     	break;
  	}
  	default:

Index: psengine.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** psengine.cpp	21 Apr 2002 12:05:04 -0000	1.170
--- psengine.cpp	21 Apr 2002 13:42:54 -0000	1.171
***************
*** 499,504 ****
  void psEngine::LoadGame()
  {
- //    csReport(object_reg, CS_REPORTER_SEVERITY_NOTIFY, PSAPP,
- //	    "PSLoader: Starting step %d: '%s'", loadstate, GetResourceName());
      switch(loadstate)
      {
--- 499,502 ----