[Planeshift-cvs] CVS: planeshift/src/server entitymanager.cpp, 1.215, 1.216

[Kemedes <ke...@us...>]

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

Modified Files:
	entitymanager.cpp 
Log Message:
Fixed FS#293.


Index: entitymanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/entitymanager.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** entitymanager.cpp	16 Sep 2007 11:11:32 -0000	1.215
--- entitymanager.cpp	23 Sep 2007 05:30:58 -0000	1.216
***************
*** 1241,1244 ****
--- 1241,1246 ----
      csVector3 targetPoint;
      float yRot = 0.0;
+     int instance;
+ 
      gemActor *subject = dynamic_cast< gemActor * > (source);
  
***************
*** 1249,1254 ****
  
      dest->GetPosition(targetPoint, yRot, targetSector);
!     
!     if ( SamePos( source, targetSector, targetPoint ) )
      {
          return;
--- 1251,1257 ----
  
      dest->GetPosition(targetPoint, yRot, targetSector);
!     instance = dest->GetInstance();
! 
!     if ( SamePos( source, targetSector, targetPoint ) && (source->GetInstance() == instance) )
      {
          return;
***************
*** 1258,1261 ****
--- 1261,1265 ----
      subject->pcmove->SetVelocity( csVector3(0.0f,0.0f,0.0f) );
      subject->SetPosition(targetPoint, yRot, targetSector);
+     subject->SetInstance(instance);
  
      // Update all clients with new position