[Planeshift-cvs] CVS: planeshift/src/server creationmanager.cpp, 1.69, 1.70

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

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

Modified Files:
	creationmanager.cpp 
Log Message:
- Added check for texture existing to material manager.
- Check for raceinfo spawn point if there's no tutorial level.

Index: creationmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/creationmanager.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** creationmanager.cpp	14 Oct 2007 13:08:03 -0000	1.69
--- creationmanager.cpp	14 Oct 2007 15:21:30 -0000	1.70
***************
*** 827,830 ****
--- 827,831 ----
  	chardata->SetHitPointsMaxModifier(0.0);
  
+     // Try tutorial level first.
      const char* sectorname = "tutorial";
      float x = -232.00f;
***************
*** 833,845 ****
      float yrot = 4.0f;
  
!     psSectorInfo *sectorinfo=CacheManager::GetSingleton().GetSectorInfoByName(sectorname);
!     if (sectorinfo==NULL)
      {
!         Error2("Unresolvable starting sector='%s'", sectorname );
!         psCharRejectedMessage reject(me->clientnum);
!         psserver->GetEventManager()->Broadcast(reject.msg, NetBase::BC_FINALPACKET);
!         psserver->RemovePlayer (me->clientnum,"No starting Sector.");
!         delete chardata;
!         return;
      }
  
--- 834,852 ----
      float yrot = 4.0f;
  
!     psSectorInfo *sectorinfo = CacheManager::GetSingleton().GetSectorInfoByName(sectorname);
!     if (!sectorinfo)
      {
!         // Now try the raceinfo starting location.
!         raceinfo->GetStartingLocation(x,y,z,yrot,sectorname);
!         psSectorInfo *sectorinfo = CacheManager::GetSingleton().GetSectorInfoByName(sectorname);
!         if (!sectorinfo)
!         {        
!             Error2("Unresolvable starting sector='%s'", sectorname );
!             psCharRejectedMessage reject(me->clientnum);
!             psserver->GetEventManager()->Broadcast(reject.msg, NetBase::BC_FINALPACKET);
!             psserver->RemovePlayer (me->clientnum,"No starting Sector.");
!             delete chardata;
!             return;
!         }
      }