[Planeshift-cvs] CVS: planeshift/src/server cachemanager.cpp, 1.162, 1.163 entitymanager.cpp, 1.164, 1.165

[Anders R. <ma...@us...>]

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

Modified Files:
	cachemanager.cpp entitymanager.cpp 
Log Message:
Fixed compiler warning and added print of number of common strings to
startup log.


Index: cachemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/cachemanager.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** cachemanager.cpp	3 Jul 2006 00:43:12 -0000	1.162
--- cachemanager.cpp	18 Jul 2006 07:20:07 -0000	1.163
***************
*** 478,481 ****
--- 478,482 ----
          msg_strings.Register(result[currentrow]["string"],(csStringID)result[currentrow].GetUInt32("id"));
  
+     Notify2( LOG_STARTUP, "%d Common Strings Loaded", msg_strings.GetSize() );
      return true;
  }

Index: entitymanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/entitymanager.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** entitymanager.cpp	9 Jul 2006 14:49:25 -0000	1.164
--- entitymanager.cpp	18 Jul 2006 07:20:07 -0000	1.165
***************
*** 285,291 ****
      psFamiliarType *ft = NULL;
      // Get Familiar Affinity 
! 	csString animalAffinity = charData->GetAnimalAffinity();
  
! 	if ( animalAffinity.Length() == 0 ) 
      {
          // No animal affinity data was found
--- 285,291 ----
      psFamiliarType *ft = NULL;
      // Get Familiar Affinity 
!     csString animalAffinity = charData->GetAnimalAffinity();
  
!     if ( animalAffinity.Length() == 0 ) 
      {
          // No animal affinity data was found
***************
*** 303,321 ****
  
      // Parse the string into an XML document.
! 	csRef<iDocument> xmlDoc = ParseString( animalAffinity );
  	
! 	// Find existing nodes
! 	csRef<iDocumentNodeIterator> iter = xmlDoc->GetRoot()->GetNodes();
! 	csRef<iDocumentNode> node;
! 	bool found = false;
! 
! 	while ( iter->HasNext() )
! 	{
! 		node = iter->Next();
! 
          csString attribute = node->GetAttributeValue( "attribute" );
! 		csString name      = node->GetAttributeValue( "name" );
          float value        = node->GetAttributeValueAsFloat( "value" );
! 
          if ( attribute.Length() != 0 && name.Length() != 0 )
          {
--- 303,321 ----
  
      // Parse the string into an XML document.
!     csRef<iDocument> xmlDoc = ParseString( animalAffinity );
  	
!     // Find existing nodes
!     csRef<iDocumentNodeIterator> iter = xmlDoc->GetRoot()->GetNodes();
!     csRef<iDocumentNode> node;
!     bool found = false;
!     
!     while ( iter->HasNext() )
!     {
!         node = iter->Next();
!         
          csString attribute = node->GetAttributeValue( "attribute" );
!         csString name      = node->GetAttributeValue( "name" );
          float value        = node->GetAttributeValueAsFloat( "value" );
!         
          if ( attribute.Length() != 0 && name.Length() != 0 )
          {
***************
*** 326,333 ****
                  charAttributes.Put( attribute, charAttributeList ); 
              }
!             charAttributeList->Put( name, value );
          }
! 	}
! 
      // For each entry in familiar_definitions
      while ( ftIter.HasNext() )
--- 326,333 ----
                  charAttributes.Put( attribute, charAttributeList ); 
              }
!             charAttributeList->Put( name, (size_t)value );
          }
!     }
!     
      // For each entry in familiar_definitions
      while ( ftIter.HasNext() )
***************
*** 413,417 ****
  
          MathScriptVar* manaValue =  msAffinity->GetVar("Affinity");
!         affinityValue = manaValue->GetValue();
      }
  
--- 413,417 ----
  
          MathScriptVar* manaValue =  msAffinity->GetVar("Affinity");
!         affinityValue = (size_t)manaValue->GetValue();
      }