[Planeshift-cvs] CVS: planeshift/src/server actionmanager.cpp,1.27,1.28 psserverchar.cpp,1.358,1.359

[Luca P. <lpa...@us...>]

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

Modified Files:
	actionmanager.cpp psserverchar.cpp 
Log Message:
better check for container ID

Index: actionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/actionmanager.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** actionmanager.cpp	5 Apr 2006 09:08:31 -0000	1.27
--- actionmanager.cpp	5 Apr 2006 12:29:38 -0000	1.28
***************
*** 668,675 ****
      client->SetTargetObject( action->GetGemObject() );
  
!     // check if the object is a dummy or real
!     int instance_id = 0;
!     if (action->GetGemObject())
        instance_id = action->GetGemObject()->GetEntity()->GetID();
  
      gemObject* realObject = psserver->GetEntityManager()->GetGEM()->FindObjectFromInstanceID( instance_id );
--- 668,676 ----
      client->SetTargetObject( action->GetGemObject() );
  
!     // check if the object is linked to a container or not
!     int instance_id = action->getInstanceIDOfContainer();
!     if (instance_id==-1) {
        instance_id = action->GetGemObject()->GetEntity()->GetID();
+     }
  
      gemObject* realObject = psserver->GetEntityManager()->GetGEM()->FindObjectFromInstanceID( instance_id );

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.358
retrieving revision 1.359
diff -C2 -d -r1.358 -r1.359
*** psserverchar.cpp	5 Apr 2006 09:08:31 -0000	1.358
--- psserverchar.cpp	5 Apr 2006 12:29:38 -0000	1.359
***************
*** 139,143 ****
                      return;
                  }
!                 
                  csRef<iDocumentNode> root    = doc->GetRoot();
                  if(!root)
--- 139,143 ----
                      return;
                  }
! 
                  csRef<iDocumentNode> root    = doc->GetRoot();
                  if(!root)