[Planeshift-cvs] CVS: planeshift/src/server gem.cpp,1.186,1.187 gem.h,1.83,1.84

[Andy D. <kha...@us...>]

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

Modified Files:
	gem.cpp gem.h 
Log Message:
Tweaked /unstick so you can't /unstick to where you died.

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** gem.cpp	17 Jan 2005 11:56:58 -0000	1.186
--- gem.cpp	17 Jan 2005 12:01:41 -0000	1.187
***************
*** 1809,1813 ****
  }
  
! void gemActor::UpdateValidLocation(csVector3& pos, float vel_y, float yrot, iSector* sector, bool force)
  {
      // 10m hops
--- 1809,1813 ----
  }
  
! void gemActor::UpdateValidLocation(const csVector3& pos, float vel_y, float yrot, iSector* sector, bool force)
  {
      // 10m hops

Index: gem.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** gem.h	17 Jan 2005 11:56:58 -0000	1.83
--- gem.h	17 Jan 2005 12:01:41 -0000	1.84
***************
*** 401,404 ****
--- 401,406 ----
  	csArray<csString> active_spell_categories;
  
+     void UpdateValidLocation(const csVector3& pos, float vel_y, float yrot, iSector* sector, bool force = false);
+ 
      float displaceY;
      iSector* portalSector;
***************
*** 442,447 ****
      void MulticastDRUpdate(MsgEntry *resend = NULL);
  
-     void UpdateValidLocation(csVector3& pos, float vel_y, float yrot, iSector* sector, bool force = false);
- 
      virtual psCharacter *GetCharacterData();
  
--- 444,447 ----