[Planeshift-cvs] CVS: planeshift/src/server npcmanager.cpp, 1.141, 1.142

[Borrillis <bor...@us...>]

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

Modified Files:
	npcmanager.cpp 
Log Message:
- Attempt to stop crashes in PetSession code.

Index: npcmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/npcmanager.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** npcmanager.cpp	19 Aug 2006 11:04:57 -0000	1.141
--- npcmanager.cpp	2 Sep 2006 23:56:05 -0000	1.142
***************
*** 190,201 ****
  		    this->elapsedTime += elapsed;
  
              CheckSession();
  
              bool done = false;
              csArray<gemActor *>* pets = owner->GetClient()->GetPets();
              for( size_t i = 0; i < pets->Length(); i++ )
              {
                  pet = (*pets)[ i ];
!                 if ( pet && pet->GetCharacterData()->GetCharacterID() == petID )
                      break;
                  else
--- 190,203 ----
  		    this->elapsedTime += elapsed;
  
+             //Update Session status using new elpasedTime values
              CheckSession();
  
              bool done = false;
              csArray<gemActor *>* pets = owner->GetClient()->GetPets();
+             // Check to make sure this pet is still summoned
              for( size_t i = 0; i < pets->Length(); i++ )
              {
                  pet = (*pets)[ i ];
!                 if ( pet && pet->GetCharacterData() && pet->GetCharacterData()->GetCharacterID() == petID )
                      break;
                  else