[Planeshift-cvs] CVS: planeshift/src/server creationmanager.cpp, 1.67, 1.68

[Xordan <mg...@us...>]

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

Modified Files:
	creationmanager.cpp 
Log Message:
- First spawn is always in tutorial.

Index: creationmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/creationmanager.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** creationmanager.cpp	8 Oct 2007 18:04:02 -0000	1.67
--- creationmanager.cpp	14 Oct 2007 13:05:06 -0000	1.68
***************
*** 827,845 ****
  	chardata->SetHitPointsMaxModifier(0.0);
  
!     float x,y,z,yrot;
!     const char *sectorname;
! 
!     raceinfo->GetStartingLocation(x,y,z,yrot,sectorname);
! 
!     if (sectorname==NULL)
!     {
!         Error1("Race has NULL starting sector" );
!         psCharRejectedMessage reject(me->clientnum);
!         psserver->GetEventManager()->Broadcast(reject.msg, NetBase::BC_FINALPACKET);
!         psserver->RemovePlayer (me->clientnum,"No starting Sector.");
!         delete chardata;
!         return;
!     }
!     psSectorInfo *sectorinfo=CacheManager::GetSingleton().GetSectorInfoByName(sectorname);
      if (sectorinfo==NULL)
      {
--- 827,831 ----
  	chardata->SetHitPointsMaxModifier(0.0);
  
!     psSectorInfo *sectorinfo=CacheManager::GetSingleton().GetSectorInfoByName("tutorial");
      if (sectorinfo==NULL)
      {
***************
*** 853,857 ****
  
      uint32 newinstance = psserver->GetRandom(INT_MAX-1)+1;
!     chardata->SetLocationInWorld(newinstance,sectorinfo,x,y,z,yrot);  // Chars will start on random instance
  
      psTrait * trait;
--- 839,843 ----
  
      uint32 newinstance = psserver->GetRandom(INT_MAX-1)+1;
!     chardata->SetLocationInWorld(newinstance, sectorinfo, -232.00, 21.31, 31.50, 4);  // Chars will start on random instance
  
      psTrait * trait;