[Planeshift-cvs] CVS: planeshift/src/server workmanager.cpp,1.38,1.39 usermanager.h,1.30,1.31 usermanager.cpp,1.125,1.126 spellmanager.cpp,1.57,1.58 spawnmanager.cpp,1.59,1.60 questmanager.cpp,1.10,1.11 psserverdr.cpp,1.58,1.59 psserverchar.cpp,1.185,1.186 psproxlist.cpp,1.13,1.14 psdatabase.cpp,1.156,1.157 paladinjr.h,1.5,1.6 paladinjr.cpp,1.9,1.10 guildmanager.cpp,1.84,1.85 groupmanager.cpp,1.27,1.28 gem.cpp,1.76,1.77 exchangemanager.cpp,1.64,1.65 entitymanager.cpp,1.42,1.43 creationmanager.cpp,1.19,1.20 command.cpp,1.124,1.125 combatmanager.cpp,1.48,1.49 clients.cpp,1.22,1.23 client.h,1.49,1.50 client.cpp,1.51,1.52 chatmanager.cpp,1.96,1.97 cachemanager.cpp,1.53,1.54 authentserver.cpp,1.105,1.106 adminmanager.cpp,1.81,1.82

[Keith F. <ven...@us...>]

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

Modified Files:
	workmanager.cpp usermanager.h usermanager.cpp spellmanager.cpp 
	spawnmanager.cpp questmanager.cpp psserverdr.cpp 
	psserverchar.cpp psproxlist.cpp psdatabase.cpp paladinjr.h 
	paladinjr.cpp guildmanager.cpp groupmanager.cpp gem.cpp 
	exchangemanager.cpp entitymanager.cpp creationmanager.cpp 
	command.cpp combatmanager.cpp clients.cpp client.h client.cpp 
	chatmanager.cpp cachemanager.cpp authentserver.cpp 
	adminmanager.cpp 
Log Message:
Fixed size_t csArray<> change.
Standardized all our "if(" and "for(" to be "if (" and "for (" while I was at it.

Index: workmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** workmanager.cpp	4 Jul 2004 01:33:15 -0000	1.38
--- workmanager.cpp	4 Jul 2004 04:46:56 -0000	1.39
***************
*** 134,138 ****
  {
      // Assign the memeber vars
!     if( !LoadLocalVars(client) )
      {
          return;
--- 134,138 ----
  {
      // Assign the memeber vars
!     if ( !LoadLocalVars(client) )
      {
          return;
***************
*** 140,144 ****
     
      //Check if we are starting or stopping use
!     if( owner->GetMode() != PSCHARACTER_MODE_WORK )
      {
          ValidateUseWork(client);
--- 140,144 ----
     
      //Check if we are starting or stopping use
!     if ( owner->GetMode() != PSCHARACTER_MODE_WORK )
      {
          ValidateUseWork(client);
***************
*** 213,217 ****
      const char *sectorname = sector->QueryObject()->GetName();
      
!     int i;
      float mindist = 100000;
      for (i=0; i<resources.Length(); i++)
--- 213,217 ----
      const char *sectorname = sector->QueryObject()->GetName();
      
!     size_t i;
      float mindist = 100000;
      for (i=0; i<resources.Length(); i++)
***************
*** 299,303 ****
  
      // Check for any targeted container or container in hand
!     if(!ValidateTarget(client))
      {
          return;
--- 299,303 ----
  
      // Check for any targeted container or container in hand
!     if (!ValidateTarget(client))
      {
          return;
***************
*** 305,312 ****
  
      // Check if there is a target and it's a container
!     if( workItem && workItem->GetIsContainer())
      {
          // Check for conainter combinations
!         if( CheckCombineContainer() )
          {
              return;
--- 305,312 ----
  
      // Check if there is a target and it's a container
!     if ( workItem && workItem->GetIsContainer())
      {
          // Check for conainter combinations
!         if ( CheckCombineContainer() )
          {
              return;
***************
*** 314,318 ****
  
          // Check for conainter Transformations
!         if( CheckTransformContainer() )
          {
              return;
--- 314,318 ----
  
          // Check for conainter Transformations
!         if ( CheckTransformContainer() )
          {
              return;
***************
*** 323,327 ****
      else
      {
!         if( CheckCombineInHand() )
          {
              return;
--- 323,327 ----
      else
      {
!         if ( CheckCombineInHand() )
          {
              return;
***************
*** 329,333 ****
  
          // Check for conainter Transformations
!         if( CheckTransformInHand() )
          {
              return;
--- 329,333 ----
  
          // Check for conainter Transformations
!         if ( CheckTransformInHand() )
          {
              return;
***************
*** 345,349 ****
  {
  //    // Check if we are working
! //    if( owner->GetMode() != PSCHARACTER_MODE_WORK )
  //    {
  //        psserver->SendSystemInfo(clientNum,"You are not using anything." );
--- 345,349 ----
  {
  //    // Check if we are working
! //    if ( owner->GetMode() != PSCHARACTER_MODE_WORK )
  //    {
  //        psserver->SendSystemInfo(clientNum,"You are not using anything." );
***************
*** 352,356 ****
  
      // Check for any target of use
!     if( !ValidateTarget(client))
      {
          return;
--- 352,356 ----
  
      // Check for any target of use
!     if ( !ValidateTarget(client))
      {
          return;
***************
*** 382,386 ****
      // Verify there is a valad transformation for the item that was dropped
      unsigned int autoID = autoItem->GetBaseStats()->GetUID();
!     if( IsTransformable( autoID, count) )
      {
          // Set up event for auto transformation
--- 382,386 ----
      // Verify there is a valad transformation for the item that was dropped
      unsigned int autoID = autoItem->GetBaseStats()->GetUID();
!     if ( IsTransformable( autoID, count) )
      {
          // Set up event for auto transformation
***************
*** 399,403 ****
  {
      // Assign the memeber vars
!     if( !LoadLocalVars(client) )
      {
          return;
--- 399,403 ----
  {
      // Assign the memeber vars
!     if ( !LoadLocalVars(client) )
      {
          return;
***************
*** 405,409 ****
  
      // Check if we are not working
!     if( owner->GetMode() != PSCHARACTER_MODE_WORK )
      {
          return;
--- 405,409 ----
  
      // Check if we are not working
!     if ( owner->GetMode() != PSCHARACTER_MODE_WORK )
      {
          return;
***************
*** 411,415 ****
  
      // Check for any target of use
!     if( !ValidateTarget(client) )
      {
          return;
--- 411,415 ----
  
      // Check for any target of use
!     if ( !ValidateTarget(client) )
      {
          return;
***************
*** 443,450 ****
      long combinationId;
      int combinationQty;
!     if( IsContainerCombinable( combinationId, combinationQty ) )
      {
          // Find out if we can do a combination transformation
!         if( IsTransformable( combinationId, combinationQty ) )
          {
              // Transform all items in container into the combination item
--- 443,450 ----
      long combinationId;
      int combinationQty;
!     if ( IsContainerCombinable( combinationId, combinationQty ) )
      {
          // Find out if we can do a combination transformation
!         if ( IsTransformable( combinationId, combinationQty ) )
          {
              // Transform all items in container into the combination item
***************
*** 476,483 ****
      long combinationId;
      int combinationQty;
!     if( IsHandCombinable( combinationId, combinationQty ) )
      {
          // Find out if we can do a combination transformation
!         if( IsTransformable( combinationId, combinationQty ) )
          {
              // Transform all items in container into the combination item
--- 476,483 ----
      long combinationId;
      int combinationQty;
!     if ( IsHandCombinable( combinationId, combinationQty ) )
      {
          // Find out if we can do a combination transformation
!         if ( IsTransformable( combinationId, combinationQty ) )
          {
              // Transform all items in container into the combination item
***************
*** 530,534 ****
      unsigned int itemID = itemArray[0]->GetBaseStats()->GetUID();
      int count = itemArray[0]->GetStackCount();
!     if( IsTransformable(itemID, count) )
      {
          // Transform all items in container into the combination item
--- 530,534 ----
      unsigned int itemID = itemArray[0]->GetBaseStats()->GetUID();
      int count = itemArray[0]->GetStackCount();
!     if ( IsTransformable(itemID, count) )
      {
          // Transform all items in container into the combination item
***************
*** 552,561 ****
      // Check if player has any transformation items in right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if( rhand != NULL )
      {
          // Find out if we can do a transformation on items in hand
          unsigned int handId = rhand->GetBaseStats()->GetUID();
          int handCount = rhand->GetStackCount();
!         if( IsTransformable( handId, handCount ) )
          {
              // Set up event for transformation
--- 552,561 ----
      // Check if player has any transformation items in right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if ( rhand != NULL )
      {
          // Find out if we can do a transformation on items in hand
          unsigned int handId = rhand->GetBaseStats()->GetUID();
          int handCount = rhand->GetStackCount();
!         if ( IsTransformable( handId, handCount ) )
          {
              // Set up event for transformation
***************
*** 571,580 ****
      // Check if player has any transformation items in left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if( lhand != NULL )
      {
          // Find out if we can do a transformation on items in hand
          unsigned int handId = lhand->GetBaseStats()->GetUID();
          int handCount = lhand->GetStackCount();
!         if( IsTransformable( handId, handCount ) )
          {
              // Set up event for transformation
--- 571,580 ----
      // Check if player has any transformation items in left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if ( lhand != NULL )
      {
          // Find out if we can do a transformation on items in hand
          unsigned int handId = lhand->GetBaseStats()->GetUID();
          int handCount = lhand->GetStackCount();
!         if ( IsTransformable( handId, handCount ) )
          {
              // Set up event for transformation
***************
*** 619,623 ****
  
      //Check if a combination is possible
!     if(ValidateCombination(itemArray, resultId, resultQty))
          return true;
      return false;
--- 619,623 ----
  
      //Check if a combination is possible
!     if (ValidateCombination(itemArray, resultId, resultQty))
          return true;
      return false;
***************
*** 636,640 ****
      // Check if player has any items in right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if( rhand )
      {
          // add item to list
--- 636,640 ----
      // Check if player has any items in right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if ( rhand )
      {
          // add item to list
***************
*** 644,648 ****
      // Check if player has any containers in left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if( lhand )
      {
          // add item to list
--- 644,648 ----
      // Check if player has any containers in left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if ( lhand )
      {
          // add item to list
***************
*** 651,655 ****
  
      //Check if a combination is possible
!     if(ValidateCombination(itemArray, resultId, resultQty))
          return true;
      return false;
--- 651,655 ----
  
      //Check if a combination is possible
!     if (ValidateCombination(itemArray, resultId, resultQty))
          return true;
      return false;
***************
*** 661,665 ****
  {
  	// check if player owns anything in conatiner
! 	if(int itemCount = itemArray.Length() != 0) 
  	{
  		// Get all possible combinations for that pattern
--- 661,665 ----
  {
  	// check if player owns anything in conatiner
! 	if (int itemCount = itemArray.Length() != 0) 
  	{
  		// Get all possible combinations for that pattern
***************
*** 673,677 ****
  		int matchCount = 0;
  		resultId = 0;
! 		for(int i=0; i<combArray->Length(); i++)
  		{
  
--- 673,677 ----
  		int matchCount = 0;
  		resultId = 0;
! 		for (size_t i=0; i<combArray->Length(); i++)
  		{
  
***************
*** 682,689 ****
  
  			// Check if the result for the combination has changed since last time
! 			if(matchResultId != resultId)
  			{
  				// If we have exact match then return
! 				if(matchCount == itemCount)
  					return true;
  
--- 682,689 ----
  
  			// Check if the result for the combination has changed since last time
! 			if (matchResultId != resultId)
  			{
  				// If we have exact match then return
! 				if (matchCount == itemCount)
  					return true;
  
***************
*** 695,706 ****
  
  			// Go though all the items in the container
! 			for(int j=0; j<itemCount; j++)
  			{
  				// Check the next contained item is this combination result item
! 				if( tradecomb->GetItemId() == itemArray[j]->GetCurrentStats()->GetUID())
  				{
  					// Increment the match count if the item stack quantity is in range
  					int stackQty = itemArray[j]->GetStackCount();
! 					if((stackQty >= tradecomb->GetMinQty())
  						&& (stackQty <= tradecomb->GetMaxQty()))
  					{
--- 695,706 ----
  
  			// Go though all the items in the container
! 			for (int j=0; j<itemCount; j++)
  			{
  				// Check the next contained item is this combination result item
! 				if ( tradecomb->GetItemId() == itemArray[j]->GetCurrentStats()->GetUID())
  				{
  					// Increment the match count if the item stack quantity is in range
  					int stackQty = itemArray[j]->GetStackCount();
! 					if ((stackQty >= tradecomb->GetMinQty())
  						&& (stackQty <= tradecomb->GetMaxQty()))
  					{
***************
*** 712,716 ****
  
  		// Set resulting item if last combination matched numbers at end
! 		if(matchCount == itemCount)
  		return true;
  	}
--- 712,716 ----
  
  		// Set resulting item if last combination matched numbers at end
! 		if (matchCount == itemCount)
  		return true;
  	}
***************
*** 732,736 ****
          return false;
      }
!     for(int i=0; i<transArray->Length(); i++)
      {
          // Only get those with correct target item and container
--- 732,736 ----
          return false;
      }
!     for (size_t i=0; i<transArray->Length(); i++)
      {
          // Only get those with correct target item and container
***************
*** 743,747 ****
          {
              // Check if we do not have the minimum quantity number
!             if( targetQty < trans->GetItemQty() )
              {
                  // Tell the player they are missing quantity
--- 743,747 ----
          {
              // Check if we do not have the minimum quantity number
!             if ( targetQty < trans->GetItemQty() )
              {
                  // Tell the player they are missing quantity
***************
*** 755,762 ****
              // Check if any equipement is required
              long equipmentId = trans->GetEquipementId();
!             if( equipmentId != 0 )
              {
                  // Check if required equipment is on hand
!                 if( !IsOnHand( equipmentId ) )
                  {
                      // Tell the player they are missing equipment
--- 755,762 ----
              // Check if any equipement is required
              long equipmentId = trans->GetEquipementId();
!             if ( equipmentId != 0 )
              {
                  // Check if required equipment is on hand
!                 if ( !IsOnHand( equipmentId ) )
                  {
                      // Tell the player they are missing equipment
***************
*** 768,772 ****
  
              // Check if the player has the correct skills
!             if( !ValidateSkills( trans ) )
              {
                  // Tell the player they are missing equipment
--- 768,772 ----
  
              // Check if the player has the correct skills
!             if ( !ValidateSkills( trans ) )
              {
                  // Tell the player they are missing equipment
***************
*** 777,781 ****
  
              // Check if the transformation constraint is meet
!             if( !ValidateConstraints( trans ) )
              {
                  // Player message comes from database
--- 777,781 ----
  
              // Check if the transformation constraint is meet
!             if ( !ValidateConstraints( trans ) )
              {
                  // Player message comes from database
***************
*** 873,881 ****
          // Check if player has any containers in right hand
          psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!         if( rhand )
          {
              // If it's a container it's our target
! //            if( rhand->GetCurrentStats()->GetIsContainer() )
!             if( rhand->GetIsContainer() )
              {
                  workItem = rhand;
--- 873,881 ----
          // Check if player has any containers in right hand
          psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!         if ( rhand )
          {
              // If it's a container it's our target
! //            if ( rhand->GetCurrentStats()->GetIsContainer() )
!             if ( rhand->GetIsContainer() )
              {
                  workItem = rhand;
***************
*** 886,893 ****
          // Check if player has any containers in left hand
          psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!         if( lhand )
          {
              // If it's a container it's our target
!             if( lhand->GetIsContainer() )
              {
                  workItem = lhand;
--- 886,893 ----
          // Check if player has any containers in left hand
          psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!         if ( lhand )
          {
              // If it's a container it's our target
!             if ( lhand->GetIsContainer() )
              {
                  workItem = lhand;
***************
*** 903,907 ****
  bool psWorkManager::LoadLocalVars(Client* client)
  {
!     if( client == NULL )
      {
          Debug1(LOG_TRADE,"Bad client pointer.");
--- 903,907 ----
  bool psWorkManager::LoadLocalVars(Client* client)
  {
!     if ( client == NULL )
      {
          Debug1(LOG_TRADE,"Bad client pointer.");
***************
*** 910,914 ****
  
      clientNum = client->GetClientNum();
!     if( clientNum == 0 )
      {
          Debug1(LOG_TRADE,"Bad client number.");
--- 910,914 ----
  
      clientNum = client->GetClientNum();
!     if ( clientNum == 0 )
      {
          Debug1(LOG_TRADE,"Bad client number.");
***************
*** 917,921 ****
  
      worker = client->GetActor();
!     if( worker == NULL )
      {
          Debug1(LOG_TRADE,"Bad client GetActor pointer.");
--- 917,921 ----
  
      worker = client->GetActor();
!     if ( worker == NULL )
      {
          Debug1(LOG_TRADE,"Bad client GetActor pointer.");
***************
*** 924,928 ****
  
      workerCID = worker->GetClientID();
!     if( workerCID == 0 )
      {
          Debug1(LOG_TRADE,"Bad client ID.");
--- 924,928 ----
  
      workerCID = worker->GetClientID();
!     if ( workerCID == 0 )
      {
          Debug1(LOG_TRADE,"Bad client ID.");
***************
*** 931,935 ****
  
      owner = worker->GetCharacterData();
!     if( owner == NULL )
      {
          Debug1(LOG_TRADE,"Bad client actor character data pointer.");
--- 931,935 ----
  
      owner = worker->GetCharacterData();
!     if ( owner == NULL )
      {
          Debug1(LOG_TRADE,"Bad client actor character data pointer.");
***************
*** 949,953 ****
      // Check for the existance of a design item
      psItem* designitem = owner->GetEffectiveWeaponInSlot( PSCHARACTER_SLOT_MIND );
!     if( designitem == 0 )
      {
          psserver->SendSystemInfo(clientNum,"You have nothing in mind." );
--- 949,953 ----
      // Check for the existance of a design item
      psItem* designitem = owner->GetEffectiveWeaponInSlot( PSCHARACTER_SLOT_MIND );
!     if ( designitem == 0 )
      {
          psserver->SendSystemInfo(clientNum,"You have nothing in mind." );
***************
*** 959,963 ****
      psTradePatterns* pattern =
          psServer::cachemanager.InstantiateTradePatternByDesignID( itemStats->GetUID() );
!     if( pattern == NULL )
      {
          Debug3(LOG_TRADE,"ValidateWork() could not find pattern ID for item %u (%s) in mind slot",
--- 959,963 ----
      psTradePatterns* pattern =
          psServer::cachemanager.InstantiateTradePatternByDesignID( itemStats->GetUID() );
!     if ( pattern == NULL )
      {
          Debug3(LOG_TRADE,"ValidateWork() could not find pattern ID for item %u (%s) in mind slot",
***************
*** 985,991 ****
      // Check right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if( rhand )
      {
!         if( equipId == rhand->GetCurrentStats()->GetUID() )
          {
              return true;
--- 985,991 ----
      // Check right hand
      psItem* rhand = owner->GetItemInSlot(PSCHARACTER_SLOT_RIGHTHAND);
!     if ( rhand )
      {
!         if ( equipId == rhand->GetCurrentStats()->GetUID() )
          {
              return true;
***************
*** 995,1001 ****
      // Check left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if( lhand )
      {
!         if( equipId == lhand->GetCurrentStats()->GetUID() )
          {
              return true;
--- 995,1001 ----
      // Check left hand
      psItem* lhand = owner->GetItemInSlot(PSCHARACTER_SLOT_LEFTHAND);
!     if ( lhand )
      {
!         if ( equipId == lhand->GetCurrentStats()->GetUID() )
          {
              return true;
***************
*** 1012,1020 ****
      // Check if player’s primary skill levels are less then minimum for that skill
      int priSkill = trans->GetPrimarySkillId();
!     if( priSkill != 0)
      {
          int minPriSkill = trans->GetMinPrimarySkill(); 
          int basePriSkill = owner->GetBaseSkill((PSSKILL)priSkill);
!         if( minPriSkill > basePriSkill )
          {
              return false;
--- 1012,1020 ----
      // Check if player’s primary skill levels are less then minimum for that skill
      int priSkill = trans->GetPrimarySkillId();
!     if ( priSkill != 0)
      {
          int minPriSkill = trans->GetMinPrimarySkill(); 
          int basePriSkill = owner->GetBaseSkill((PSSKILL)priSkill);
!         if ( minPriSkill > basePriSkill )
          {
              return false;
***************
*** 1024,1032 ****
      // Check if player’s secondary skill levels are less then minimum for that skill
      int secSkill = trans->GetSecondarySkillId();
!     if( secSkill != 0)
      {
          int minSecSkill = trans->GetMinSecondarySkill(); 
          int baseSecSkill = owner->GetBaseSkill((PSSKILL)secSkill);
!         if( minSecSkill > baseSecSkill )
          {
              return false;
--- 1024,1032 ----
      // Check if player’s secondary skill levels are less then minimum for that skill
      int secSkill = trans->GetSecondarySkillId();
!     if ( secSkill != 0)
      {
          int minSecSkill = trans->GetMinSecondarySkill(); 
          int baseSecSkill = owner->GetBaseSkill((PSSKILL)secSkill);
!         if ( minSecSkill > baseSecSkill )
          {
              return false;
***************
*** 1039,1047 ****
      csPDelArray<psTradeTransformationSkills>* transSkillsArray =
  //-->        psServer::cachemanager.FindTransformationSkillsList(trans->GetId());
!     if( transSkillsArray == NULL)
      {
          return true;
      }
!     for(int i=0; i<transSkillsArray->Length(); i++)
      {
          // Check if player’s skill levels are less then minimum for that skill
--- 1039,1047 ----
      csPDelArray<psTradeTransformationSkills>* transSkillsArray =
  //-->        psServer::cachemanager.FindTransformationSkillsList(trans->GetId());
!     if ( transSkillsArray == NULL)
      {
          return true;
      }
!     for (int i=0; i<transSkillsArray->Length(); i++)
      {
          // Check if player’s skill levels are less then minimum for that skill
***************
*** 1049,1053 ****
          int skill = transSkillsArray->Get(i)->GetSkillId();
          int baseSkill = owner->GetBaseSkill((PSSKILL)skill);
!         if( minSkill > baseSkill )
          {
              return false;
--- 1049,1053 ----
          int skill = transSkillsArray->Get(i)->GetSkillId();
          int baseSkill = owner->GetBaseSkill((PSSKILL)skill);
!         if ( minSkill > baseSkill )
          {
              return false;
***************
*** 1082,1086 ****
          psTradeConstraints* constraint = 
           psServer::cachemanager.InstantiateTradeConstraintsByName( constraintPtr );
!         if( constraint == NULL )
          {
              Debug2(LOG_TRADE,
--- 1082,1086 ----
          psTradeConstraints* constraint = 
           psServer::cachemanager.InstantiateTradeConstraintsByName( constraintPtr );
!         if ( constraint == NULL )
          {
              Debug2(LOG_TRADE,
***************
*** 1319,1323 ****
  
      // Skip if no X constraint co-ord specified
!     if( strlen(xloc) != 0 )
      {
          // Check X location
--- 1319,1323 ----
  
      // Skip if no X constraint co-ord specified
!     if ( strlen(xloc) != 0 )
      {
          // Check X location
***************
*** 1328,1332 ****
  
      // Skip if no Y constraint co-ord specified
!     if( strlen(yloc) != 0 )
      {
          // Check Y location
--- 1328,1332 ----
  
      // Skip if no Y constraint co-ord specified
!     if ( strlen(yloc) != 0 )
      {
          // Check Y location
***************
*** 1337,1341 ****
  
      // Skip if no Z constraint co-ord specified
!     if( strlen(zloc) != 0 )
      {
          // Check Z location
--- 1337,1341 ----
  
      // Skip if no Z constraint co-ord specified
!     if ( strlen(zloc) != 0 )
      {
          // Check Z location
***************
*** 1346,1350 ****
  
      // Skip if no Yrot constraint co-ord specified
!     if( strlen(yrotation) != 0 )
      {
          // Check Y rotation
--- 1346,1350 ----
  
      // Skip if no Yrot constraint co-ord specified
!     if ( strlen(yrotation) != 0 )
      {
          // Check Y rotation
***************
*** 1355,1359 ****
  
      // Skip if no sector constraint name specified
!     if( strlen(sector) != 0 )
      {
          // Check sector
--- 1355,1359 ----
  
      // Skip if no sector constraint name specified
!     if ( strlen(sector) != 0 )
      {
          // Check sector
***************
*** 1420,1428 ****
  
      // Check and apply the skills to quality and practice points
!     if( !ApplySkills(trans) )
      {
          // Failed skill check
          psserver->SendSystemInfo(clientNum, "You have made a mess of things.  You need more skill.");
!         if( curSlot == 0)
          {
              TransformContainedItem( trans->GetGarbageId(), trans->GetGarbageQty(), 1.00 );
--- 1420,1428 ----
  
      // Check and apply the skills to quality and practice points
!     if ( !ApplySkills(trans) )
      {
          // Failed skill check
          psserver->SendSystemInfo(clientNum, "You have made a mess of things.  You need more skill.");
!         if ( curSlot == 0)
          {
              TransformContainedItem( trans->GetGarbageId(), trans->GetGarbageQty(), 1.00 );
***************
*** 1437,1441 ****
      {
          // Do the transformation from the transformation table
!         if( curSlot == 0)
          {
              TransformContainedItem( trans->GetResultId(), trans->GetResultQty(), currentQuality );
--- 1437,1441 ----
      {
          // Do the transformation from the transformation table
!         if ( curSlot == 0)
          {
              TransformContainedItem( trans->GetResultId(), trans->GetResultQty(), currentQuality );
***************
*** 1451,1455 ****
  
      // See if there is a valad next transformation for the new item
!     if( IsTransformable( trans->GetResultId(), trans->GetResultQty()) )
      {
          // Set up event for new transformation
--- 1451,1455 ----
  
      // See if there is a valad next transformation for the new item
!     if ( IsTransformable( trans->GetResultId(), trans->GetResultQty()) )
      {
          // Set up event for new transformation
***************
*** 1463,1467 ****
      // Check for a primary skill
      int priSkill = trans->GetPrimarySkillId();
!     if( priSkill != 0)
      {
          int basePriSkill = owner->GetBaseSkill((PSSKILL)priSkill);
--- 1463,1467 ----
      // Check for a primary skill
      int priSkill = trans->GetPrimarySkillId();
!     if ( priSkill != 0)
      {
          int basePriSkill = owner->GetBaseSkill((PSSKILL)priSkill);
***************
*** 1487,1491 ****
  
          // Only give primary experience to those under the max
!         if( basePriSkill < maxPriSkill )
          {
              // Get some practice in
--- 1487,1491 ----
  
          // Only give primary experience to those under the max
!         if ( basePriSkill < maxPriSkill )
          {
              // Get some practice in
***************
*** 1497,1501 ****
      // Apply the secmary skill if any
      int secSkill = trans->GetSecondarySkillId();
!     if( secSkill != 0)
      {
          int baseSecSkill = owner->GetBaseSkill((PSSKILL)secSkill);
--- 1497,1501 ----
      // Apply the secmary skill if any
      int secSkill = trans->GetSecondarySkillId();
!     if ( secSkill != 0)
      {
          int baseSecSkill = owner->GetBaseSkill((PSSKILL)secSkill);
***************
*** 1521,1525 ****
  
          // Only give secmary experience to those under the max
!         if( baseSecSkill < maxSecSkill )
          {
              // Get some practice in
--- 1521,1525 ----
  
          // Only give secmary experience to those under the max
!         if ( baseSecSkill < maxSecSkill )
          {
              // Get some practice in
***************
*** 1531,1535 ****
      // Randomize the final quality results if there is a garbage item for this transformation
      int garbage = trans->GetGarbageId();
!     if( garbage != 0 )
      {
          float K = 4.00;
--- 1531,1535 ----
      // Randomize the final quality results if there is a garbage item for this transformation
      int garbage = trans->GetGarbageId();
!     if ( garbage != 0 )
      {
          float K = 4.00;
***************
*** 1539,1543 ****
  
          // Make it perfect if it's better then perfect
!         if( currentQuality > 1.00)
          {
              currentQuality = 1.00;
--- 1539,1543 ----
  
          // Make it perfect if it's better then perfect
!         if ( currentQuality > 1.00)
          {
              currentQuality = 1.00;

Index: usermanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** usermanager.h	1 Apr 2004 12:18:13 -0000	1.30
--- usermanager.h	4 Jul 2004 04:46:56 -0000	1.31
***************
*** 323,327 ****
      csArray<AdvisorStruct>   advisors;
  
!     int advisorPos;
  };
  
--- 323,327 ----
      csArray<AdvisorStruct>   advisors;
  
!     size_t advisorPos;
  };
  

Index: usermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** usermanager.cpp	30 May 2004 07:56:41 -0000	1.125
--- usermanager.cpp	4 Jul 2004 04:46:56 -0000	1.126
***************
*** 159,163 ****
  void UserManager::HandleMessage(MsgEntry *me)
  {
! 	if(me->data->type == MSGTYPEMOTDREQUEST)
  	{
  		//Sends MOTD and tip
--- 159,163 ----
  void UserManager::HandleMessage(MsgEntry *me)
  {
! 	if (me->data->type == MSGTYPEMOTDREQUEST)
  	{
  		//Sends MOTD and tip
***************
*** 167,171 ****
  		unsigned int guildID =0;
  		//If data isn't loaded, load from db
! 		if(!client->GetCharacterData())
  		{
  			Result result(db->Select("SELECT guild_member_of FROM characters WHERE id = '%d'",client->GetPlayerID()));
--- 167,171 ----
  		unsigned int guildID =0;
  		//If data isn't loaded, load from db
! 		if (!client->GetCharacterData())
  		{
  			Result result(db->Select("SELECT guild_member_of FROM characters WHERE id = '%d'",client->GetPlayerID()));
***************
*** 177,181 ****
  			psGuildInfo* playerGuild = client->GetCharacterData()->GetGuild();
  
! 			if(playerGuild)
  				guildID = playerGuild->id;
  			else
--- 177,181 ----
  			psGuildInfo* playerGuild = client->GetCharacterData()->GetGuild();
  
! 			if (playerGuild)
  				guildID = playerGuild->id;
  			else
***************
*** 191,195 ****
  		psGuildInfo * guild = psserver->cachemanager.FindGuild(guildID);
  
! 		if(guild)
  		{
  			guildMotd=guild->GetMOTD();
--- 191,195 ----
  		psGuildInfo * guild = psserver->cachemanager.FindGuild(guildID);
  
! 		if (guild)
  		{
  			guildMotd=guild->GetMOTD();
***************
*** 202,206 ****
  
  	}
! 	else if(me->data->type == MSGTYPEUSERCMD)
  	{
  		psUserCmdMessage msg(me);
--- 202,206 ----
  
  	}
! 	else if (me->data->type == MSGTYPEUSERCMD)
  	{
  		psUserCmdMessage msg(me);
***************
*** 334,362 ****
  	    }
  	}
! 	else if( me->data->type == MSGTYPECHARDETAILSREQUEST) 
  	{
  		psCharacterDetailsRequestMessage msg(me);
  		//This function is aiming to be failsafe
  		Client *client=psserver->GetNetManager()->GetClient(me->clientnum);
! 		if(!client)	return;
  		
  		gemActor *myactor;
! 		if(!msg.isMe)
  		{
  			gemObject *target = client->GetTargetObject();
! 			if(!target)	return;
  
  			myactor = target->GetActorPtr();
! 			if(!myactor) return;
  		}
  		else
  		{
  			myactor = client->GetActor();
! 			if(!myactor) return;
  		}
  
  
  		psCharacter* charData = myactor->GetCharacterData();
! 		if(!charData) return;
  		
  
--- 334,362 ----
  	    }
  	}
! 	else if ( me->data->type == MSGTYPECHARDETAILSREQUEST) 
  	{
  		psCharacterDetailsRequestMessage msg(me);
  		//This function is aiming to be failsafe
  		Client *client=psserver->GetNetManager()->GetClient(me->clientnum);
! 		if (!client)	return;
  		
  		gemActor *myactor;
! 		if (!msg.isMe)
  		{
  			gemObject *target = client->GetTargetObject();
! 			if (!target)	return;
  
  			myactor = target->GetActorPtr();
! 			if (!myactor) return;
  		}
  		else
  		{
  			myactor = client->GetActor();
! 			if (!myactor) return;
  		}
  
  
  		psCharacter* charData = myactor->GetCharacterData();
! 		if (!charData) return;
  		
  
***************
*** 374,385 ****
  		msghandler->SendMessage(detailmsg.msg);
  	}
! 	else if(me->data->type == MSGTYPECHARDESCUPDATE)
  	{
  		psCharacterDescriptionUpdateMessage descUpdate(me);
  		Client* client = psserver->GetNetManager()->GetClient(me->clientnum);
! 		if(!client) return;
  
  		psCharacter* charData = client->GetCharacterData();
! 		if(!charData) return;
  
  		charData->SetDescription(descUpdate.newValue);
--- 374,385 ----
  		msghandler->SendMessage(detailmsg.msg);
  	}
! 	else if (me->data->type == MSGTYPECHARDESCUPDATE)
  	{
  		psCharacterDescriptionUpdateMessage descUpdate(me);
  		Client* client = psserver->GetNetManager()->GetClient(me->clientnum);
! 		if (!client) return;
  
  		psCharacter* charData = client->GetCharacterData();
! 		if (!charData) return;
  
  		charData->SetDescription(descUpdate.newValue);
***************
*** 550,554 ****
      csString name (client->GetName());
              
!     for (int i=0; i< client->GetCharacterData()->buddyOfList.Length(); i++)
      {
          Client *buddy = clients->FindPlayer( client->GetCharacterData()->buddyOfList[i] );  // name of player buddy
--- 550,554 ----
      csString name (client->GetName());
              
!     for (size_t i=0; i< client->GetCharacterData()->buddyOfList.Length(); i++)
      {
          Client *buddy = clients->FindPlayer( client->GetCharacterData()->buddyOfList[i] );  // name of player buddy
***************
*** 947,955 ****
  void UserManager::Advisor(int userId, int connectionId, psUserCmdMessage& msg)
  {
!     if( msg.filter == "on")
      {
          AddAdvisor(userId, connectionId);
      }
!     else if( msg.filter == "off")
      {
          RemoveAdvisor(userId, connectionId);
--- 947,955 ----
  void UserManager::Advisor(int userId, int connectionId, psUserCmdMessage& msg)
  {
!     if ( msg.filter == "on")
      {
          AddAdvisor(userId, connectionId);
      }
!     else if ( msg.filter == "off")
      {
          RemoveAdvisor(userId, connectionId);
***************
*** 961,967 ****
  void UserManager::AddAdvisor(int id, int connectionId)
  {
!     for(int i = 0; i < advisors.Length(); i++)
      {
!         if( id == advisors[i].id)
              return;
      }
--- 961,967 ----
  void UserManager::AddAdvisor(int id, int connectionId)
  {
!     for (size_t i = 0; i < advisors.Length(); i++)
      {
!         if ( id == advisors[i].id)
              return;
      }
***************
*** 982,988 ****
  {
      //Remove an advisor
!     for(int i = 0; i < advisors.Length(); i++)
      {
!         if(advisors[i].id = id)
          {
              advisors.DeleteIndex(i);
--- 982,988 ----
  {
      //Remove an advisor
!     for (size_t i = 0; i < advisors.Length(); i++)
      {
!         if (advisors[i].id = id)
          {
              advisors.DeleteIndex(i);
***************
*** 998,1002 ****
      printf("User asked for advice\n");
  
!     if( advisors.Length() == 0)                             //No advisor is online
      {
          //Send back an message that there is no advisor online
--- 998,1002 ----
      printf("User asked for advice\n");
  
!     if ( advisors.Length() == 0)                             //No advisor is online
      {
          //Send back an message that there is no advisor online
***************
*** 1008,1020 ****
          bool ready = false;                       //We found an advisor or all advisors are taken
          bool busy = false;                         //If true all advisors are taken
!         int loopCount = 0;                          //To look if we have had all advisors
  
          while(!ready)
          {
!             if(advisorPos >= advisors.Length())              //Keep advisorPos go in a loop
                  advisorPos = 0;
!             if(advisors[advisorPos].ready == false) //Go to the next advisor in the hope he isn't busy
              {
!                  if(loopCount >= advisors.Length())   //Every one is busy, so stop looking
                   {
                        busy = true;
--- 1008,1020 ----
          bool ready = false;                       //We found an advisor or all advisors are taken
          bool busy = false;                         //If true all advisors are taken
!         size_t loopCount = 0;                          //To look if we have had all advisors
  
          while(!ready)
          {
!             if (advisorPos >= advisors.Length())              //Keep advisorPos go in a loop
                  advisorPos = 0;
!             if (advisors[advisorPos].ready == false) //Go to the next advisor in the hope he isn't busy
              {
!                  if (loopCount >= advisors.Length())   //Every one is busy, so stop looking
                   {
                        busy = true;
***************
*** 1050,1058 ****
  {
      bool isRequest = false;
!     int advisor = 0;
      //Search loop that will found the right advisor nr in the advisors array and use it as an id
!     for(int i = 0; i < advisors.Length(); i++)
      {
!         if((advisors[i].client_id == id) && (advisors[i].ready == false))
          {
              advisor = i;
--- 1050,1058 ----
  {
      bool isRequest = false;
!     size_t advisor = 0;
      //Search loop that will found the right advisor nr in the advisors array and use it as an id
!     for (size_t i = 0; i < advisors.Length(); i++)
      {
!         if ((advisors[i].client_id == id) && (advisors[i].ready == false))
          {
              advisor = i;
***************
*** 1060,1064 ****
          }
      }
!     if( !isRequest )
          return;
  
--- 1060,1064 ----
          }
      }
!     if ( !isRequest )
          return;
  

Index: spellmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/spellmanager.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** spellmanager.cpp	1 Jul 2004 19:47:45 -0000	1.57
--- spellmanager.cpp	4 Jul 2004 04:46:56 -0000	1.58
***************
*** 258,262 ****
      psString msg;
      msg="";
!     for (int i=0; i < assembler.Length(); i++)
          msg.AppendFormat("S%i ",assembler[i]->GetUID());
      psserver->SendSystemInfo(client->GetClientNum(), msg.GetData());
--- 258,262 ----
      psString msg;
      msg="";
!     for (size_t i=0; i < assembler.Length(); i++)
          msg.AppendFormat("S%i ",assembler[i]->GetUID());
      psserver->SendSystemInfo(client->GetClientNum(), msg.GetData());
***************
*** 389,394 ****
      psCharacter * character = client->GetCharacterData();
      csArray <glyphSlot_t> slots;
!     int slotNum;
!     int wayNum;
      psString xml;
  
--- 389,394 ----
      psCharacter * character = client->GetCharacterData();
      csArray <glyphSlot_t> slots;
!     size_t slotNum;
!     size_t wayNum;
      psString xml;
  
***************
*** 584,588 ****
      
      // Start the effect if spell is successfully casted
!     if(event->spell->Effect(event, responseEffectName, offset, anchorID, targetID, &effectText))
      {
          event->caster->GetCharacterData()->AddBaseSkillPractice(event->spell->GetSkill(),1);
--- 584,588 ----
      
      // Start the effect if spell is successfully casted
!     if (event->spell->Effect(event, responseEffectName, offset, anchorID, targetID, &effectText))
      {
          event->caster->GetCharacterData()->AddBaseSkillPractice(event->spell->GetSkill(),1);

Index: spawnmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/spawnmanager.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** spawnmanager.cpp	21 May 2004 16:48:43 -0000	1.59
--- spawnmanager.cpp	4 Jul 2004 04:46:56 -0000	1.60
***************
*** 236,240 ****
          {
              //if create item returns false, then no spawn occurs
!             if(entitymanager->CreateItem( loadeditems->Get(i) ))
                  spawned++;
          }
--- 236,240 ----
          {
              //if create item returns false, then no spawn occurs
!             if (entitymanager->CreateItem( loadeditems->Get(i) ))
                  spawned++;
          }
***************
*** 774,778 ****
      float prob_so_far = 0;
  
!     for (int i=0; i<entries.Length(); i++)
      {
          if (prob_so_far < roll && roll < prob_so_far + entries[i]->probability)
--- 774,778 ----
      float prob_so_far = 0;
  
!     for (size_t i=0; i<entries.Length(); i++)
      {
          if (prob_so_far < roll && roll < prob_so_far + entries[i]->probability)
***************
*** 790,794 ****
  void LootEntrySet::CreateMultipleLoot(psCharacter *chr)
  {
!     for (int i=0; i<entries.Length(); i++)
      {
          float roll = psserver->rng->Get();
--- 790,794 ----
  void LootEntrySet::CreateMultipleLoot(psCharacter *chr)
  {
!     for (size_t i=0; i<entries.Length(); i++)
      {
          float roll = psserver->rng->Get();

Index: questmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/questmanager.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** questmanager.cpp	28 Mar 2004 17:30:51 -0000	1.10
--- questmanager.cpp	4 Jul 2004 04:46:56 -0000	1.11
***************
*** 99,108 ****
              // verify that this item was really offered to the client as a 
              // possible reward
!             for (int z=0;z<offers.Length();z++)
              {
                  QuestRewardOffer* offer = offers[z]; 
                  if (offer->clientID==me->clientnum)
                  {
!                     for (int x=0;x<offer->items.Length();x++)
                      {
                          int itemID = atoi(msg.newValue.GetData());
--- 99,108 ----
              // verify that this item was really offered to the client as a 
              // possible reward
!             for (size_t z=0;z<offers.Length();z++)
              {
                  QuestRewardOffer* offer = offers[z]; 
                  if (offer->clientID==me->clientnum)
                  {
!                     for (size_t x=0;x<offer->items.Length();x++)
                      {
                          int itemID = atoi(msg.newValue.GetData());
***************
*** 132,136 ****
      // the client side) from which a user can select a reward
      rewardList="<rewards>";
!     for (int x=0;x<offer.Length();x++)
      {
          csString image = offer[x]->GetImageName();
--- 132,136 ----
      // the client side) from which a user can select a reward
      rewardList="<rewards>";
!     for (size_t x=0;x<offer.Length();x++)
      {
          csString image = offer[x]->GetImageName();

Index: psserverdr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverdr.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** psserverdr.cpp	3 Jul 2004 11:03:46 -0000	1.58
--- psserverdr.cpp	4 Jul 2004 04:46:56 -0000	1.59
***************
*** 118,122 ****
  
          actor->DoDamage(NULL, var_fall_dmg->GetValue() );
!         if(!died)
          {
              psserver->SendSystemInfo(clientnum, "You fell down and injured yourself.");
--- 118,122 ----
  
          actor->DoDamage(NULL, var_fall_dmg->GetValue() );
!         if (!died)
          {
              psserver->SendSystemInfo(clientnum, "You fell down and injured yourself.");
***************
*** 162,166 ****
      }
  
!         if(drmsg->vel.y < -100)
              printf("drmsg->vel.y %f\n", drmsg->vel.y);
  
--- 162,166 ----
      }
  
!         if (drmsg->vel.y < -100)
              printf("drmsg->vel.y %f\n", drmsg->vel.y);
  
***************
*** 173,177 ****
  
  
!     if(drmsg->pos.y < -500)
      {
          actor->Resurrect();
--- 173,177 ----
  
  
!     if (drmsg->pos.y < -500)
      {
          actor->Resurrect();

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** psserverchar.cpp	2 Jul 2004 23:42:07 -0000	1.185
--- psserverchar.cpp	4 Jul 2004 04:46:56 -0000	1.186
***************
*** 111,115 ****
  
  	csRef<iVFS> vfs = CS_QUERY_REGISTRY (psserver->GetObjectReg(), iVFS);
! 	if(vfs)
  	{
  		if (!(vfs->Exists("this/logs/exchange.csv")))
--- 111,115 ----
  
  	csRef<iVFS> vfs = CS_QUERY_REGISTRY (psserver->GetObjectReg(), iVFS);
! 	if (vfs)
  	{
  		if (!(vfs->Exists("this/logs/exchange.csv")))
***************
*** 152,156 ****
          {
              item = item->GetItemInSlot(mesg.slotID);
!             if(!item)
              {
                  Error3( "No item: %d, %d", mesg.containerID, mesg.slotID );
--- 152,156 ----
          {
              item = item->GetItemInSlot(mesg.slotID);
!             if (!item)
              {
                  Error3( "No item: %d, %d", mesg.containerID, mesg.slotID );
***************
*** 523,527 ****
      }
  
!     for ( int ci = 0; ci < upload.choices.Length(); ci++ )
      {
          csString script(psserver->charCreationManager->FindChoice( upload.choices[ci] )->eventScript.GetData() );
--- 523,527 ----
      }
  
!     for ( size_t ci = 0; ci < upload.choices.Length(); ci++ )
      {
          csString script(psserver->charCreationManager->FindChoice( upload.choices[ci] )->eventScript.GetData() );
***************
*** 531,535 ****
          psserver->GetProgressionManager()->ProcessEvent( script, actor, actor );
      }
!     for ( int li = 0; li < upload.lifeEvents.Length(); li++ )
      {
          csString script(psserver->charCreationManager->FindLifeEvent( upload.lifeEvents[li] )->eventScript.GetData() );
--- 531,535 ----
          psserver->GetProgressionManager()->ProcessEvent( script, actor, actor );
      }
!     for ( size_t li = 0; li < upload.lifeEvents.Length(); li++ )
      {
          csString script(psserver->charCreationManager->FindLifeEvent( upload.lifeEvents[li] )->eventScript.GetData() );
***************
*** 738,742 ****
              psMerchantInfo * merchantInfo = merchant->GetMerchantInfo();
  
!             for ( int z = 0; z < merchantInfo->categories.Length(); z++ )
              {
                  psItemCategory * category = merchantInfo->categories[z];
--- 738,742 ----
              psMerchantInfo * merchantInfo = merchant->GetMerchantInfo();
  
!             for ( size_t z = 0; z < merchantInfo->categories.Length(); z++ )
              {
                  psItemCategory * category = merchantInfo->categories[z];
***************
*** 1238,1242 ****
      char item[256];
  
!     for ( int z = 0; z < items.Length(); z++ )
      {
          sprintf(item,
--- 1238,1242 ----
      char item[256];
  
!     for ( size_t z = 0; z < items.Length(); z++ )
      {
          sprintf(item,
***************
*** 1277,1286 ****
      const char * itemID;
  
!     for ( int z = 0; z < items.Length(); z++ )
      {
          itemID = items[z]->GetUIDStr();
          csString purified;
  
!         if(items[z]->GetPurifyStatus() == 2)
              purified = "yes";
          else
--- 1277,1286 ----
      const char * itemID;
  
!     for ( size_t z = 0; z < items.Length(); z++ )
      {
          itemID = items[z]->GetUIDStr();
          csString purified;
  
!         if (items[z]->GetPurifyStatus() == 2)
              purified = "yes";
          else
***************
*** 1320,1324 ****
  {
  	// glyph items can't be goals
! 	if(goal->GetCurrentStats()->GetIsGlyph())
  		return false;
  
--- 1320,1324 ----
  {
  	// glyph items can't be goals
! 	if (goal->GetCurrentStats()->GetIsGlyph())
  		return false;
  
***************
*** 1846,1850 ****
                  int toSlot = 0;                
                  bool placeFound = false;
!                 for ( int idx = 0; idx < fitsIn.Length(); idx++ )
                  {   
                      toSlot = fitsIn[idx];                                 
--- 1846,1850 ----
                  int toSlot = 0;                
                  bool placeFound = false;
!                 for ( size_t idx = 0; idx < fitsIn.Length(); idx++ )
                  {   
                      toSlot = fitsIn[idx];                                 
***************
*** 1895,1899 ****
      
                          // check to see if this container will start an auto transform of item(s)
!                         if( toContainer->GetCanTransform() )
                          {
                              psserver->GetWorkManager()->StartAutoWork(
--- 1895,1899 ----
      
                          // check to see if this container will start an auto transform of item(s)
!                         if ( toContainer->GetCanTransform() )
                          {
                              psserver->GetWorkManager()->StartAutoWork(

Index: psproxlist.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psproxlist.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** psproxlist.cpp	24 May 2004 05:22:10 -0000	1.13
--- psproxlist.cpp	4 Jul 2004 04:46:56 -0000	1.14
***************
*** 208,212 ****
  void ProximityList::EndWatching(gemObject * object)
  {
!     for (int x = 0; x < objectsThatIWatch.Length(); x++ )
          if (objectsThatIWatch[x] == object)
          {
--- 208,212 ----
  void ProximityList::EndWatching(gemObject * object)
  {
!     for (size_t x = 0; x < objectsThatIWatch.Length(); x++ )
          if (objectsThatIWatch[x] == object)
          {
***************
*** 280,284 ****
  bool ProximityList::FindObjectThatIWatch(gemObject *object)
  {
!     for (int x = 0; x < objectsThatIWatch.Length(); x++ )
      {
          if ( objectsThatIWatch[x] == object)
--- 280,284 ----
  bool ProximityList::FindObjectThatIWatch(gemObject *object)
  {
!     for (size_t x = 0; x < objectsThatIWatch.Length(); x++ )
      {
          if ( objectsThatIWatch[x] == object)
***************
*** 323,327 ****
  void ProximityList::ClearTouched()
  {
!     int objNum;
  
      for (objNum = 0; objNum < objectsThatWatchMe_touched.Length(); objNum++ )
--- 323,327 ----
  void ProximityList::ClearTouched()
  {
!     size_t objNum;
  
      for (objNum = 0; objNum < objectsThatWatchMe_touched.Length(); objNum++ )
***************
*** 333,337 ****
  bool ProximityList::GetUntouched_ObjectThatWatchesMe(gemObject* &object)
  {
!     for (int x = 0; x < objectsThatWatchMe_touched.Length(); x++ )
      {
          if (!objectsThatWatchMe_touched[x])
--- 333,337 ----
  bool ProximityList::GetUntouched_ObjectThatWatchesMe(gemObject* &object)
  {
!     for (size_t x = 0; x < objectsThatWatchMe_touched.Length(); x++ )
      {
          if (!objectsThatWatchMe_touched[x])
***************
*** 347,351 ****
  bool ProximityList::GetUntouched_ObjectThatIWatch(gemObject* &object)
  {
!     for (int x = 0; x < objectsThatIWatch_touched.Length(); x++ )
      {
          if (!objectsThatIWatch_touched[x])
--- 347,351 ----
  bool ProximityList::GetUntouched_ObjectThatIWatch(gemObject* &object)
  {
!     for (size_t x = 0; x < objectsThatIWatch_touched.Length(); x++ )
      {
          if (!objectsThatIWatch_touched[x])
***************
*** 391,395 ****
  void ProximityList::DebugDumpContents()
  {
!     int x;
  
  	printf("I represent client %d\n",clientnum);
--- 391,395 ----
  void ProximityList::DebugDumpContents()
  {
!     size_t x;
  
  	printf("I represent client %d\n",clientnum);

Index: psdatabase.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psdatabase.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** psdatabase.cpp	15 Apr 2004 12:46:56 -0000	1.156
--- psdatabase.cpp	4 Jul 2004 04:46:56 -0000	1.157
***************
*** 71,75 ****
      db->Initialize(host,database,user,password);
  
!     if(!db->IsValid())
      {
          CPrintf ("db connection attempt failed\n");
--- 71,75 ----
      db->Initialize(host,database,user,password);
  
!     if (!db->IsValid())
      {
          CPrintf ("db connection attempt failed\n");
***************
*** 79,83 ****
  
      psString db_version;
!     if( ! GetServerOption("db_version", db_version) )
      {
          CPrintf ("Couldn't determine database version\n");
--- 79,83 ----
  
      psString db_version;
!     if ( ! GetServerOption("db_version", db_version) )
      {
          CPrintf ("Couldn't determine database version\n");
***************
*** 85,89 ****
          return false;
      }
!     if( strcmp( db_version, DATABASE_VERSION_STR ) )
      {
          CPrintf ("Database version mismatch: we have '%s' while we are looking for '%s'. Recreate your database using create_all.sql\n", (const char*)db_version, DATABASE_VERSION_STR);
--- 85,89 ----
          return false;
      }
!     if ( strcmp( db_version, DATABASE_VERSION_STR ) )
      {
          CPrintf ("Database version mismatch: we have '%s' while we are looking for '%s'. Recreate your database using create_all.sql\n", (const char*)db_version, DATABASE_VERSION_STR);
***************
*** 283,287 ****
      rs = db->Select("SELECT trigger FROM npc_triggers " 
                         "WHERE area='%s'", db->Escape(data).GetData());
!     if( !rs )
      {
          Error2("db ERROR: %s", db->GetLastError());
--- 283,287 ----
      rs = db->Select("SELECT trigger FROM npc_triggers " 
                         "WHERE area='%s'", db->Escape(data).GetData());
!     if ( !rs )
      {
          Error2("db ERROR: %s", db->GetLastError());
***************
*** 312,316 ****
      rs = db->Select("SELECT * FROM npc_responses " 
                         "WHERE id=%d",id);
!     if( !rs )
      {
          Error2("db ERROR: %s", db->GetLastError());
--- 312,316 ----
      rs = db->Select("SELECT * FROM npc_responses " 
                         "WHERE id=%d",id);
!     if ( !rs )
      {
          Error2("db ERROR: %s", db->GetLastError());
***************
*** 345,349 ****
  					"option_name='%s'", db->Escape(option_name).GetData()));
  
!     if(!result.IsValid())
      {
          lasterror.Format("Couldn't execute query.\nCommand was "
--- 345,349 ----
  					"option_name='%s'", db->Escape(option_name).GetData()));
  
!     if (!result.IsValid())
      {
          lasterror.Format("Couldn't execute query.\nCommand was "
***************
*** 367,371 ****
                                "npc_master_id=0 and name='%s'", db->Escape(name).GetData()));
  
!     if(!result.IsValid())
      {
          lasterror.Format("Couldn't execute query.\nCommand was "
--- 367,371 ----
                                "npc_master_id=0 and name='%s'", db->Escape(name).GetData()));
  
!     if (!result.IsValid())
      {
          lasterror.Format("Couldn't execute query.\nCommand was "

Index: paladinjr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/paladinjr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** paladinjr.h	3 Jul 2004 11:03:46 -0000	1.5
--- paladinjr.h	4 Jul 2004 04:46:56 -0000	1.6
***************
*** 48,52 ****
          enabled = configmanager->GetBool("Planeshift.Paladin.Enabled");
  
!         if(!enabled)
              return;
  
--- 48,52 ----
          enabled = configmanager->GetBool("Planeshift.Paladin.Enabled");
  
!         if (!enabled)
              return;
  
***************
*** 54,58 ****
  
  		csRef<iVFS> vfs = CS_QUERY_REGISTRY (psserver->GetObjectReg(), iVFS);
! 		if(vfs)
  		{
  			if (!(vfs->Exists("this/logs/paladin.csv")))
--- 54,58 ----
  
  		csRef<iVFS> vfs = CS_QUERY_REGISTRY (psserver->GetObjectReg(), iVFS);
! 		if (vfs)
  		{
  			if (!(vfs->Exists("this/logs/paladin.csv")))

Index: paladinjr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/paladinjr.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** paladinjr.cpp	3 Jul 2004 11:03:46 -0000	1.9
--- paladinjr.cpp	4 Jul 2004 04:46:56 -0000	1.10
***************
*** 33,37 ****
  void paladinJr::PredictClient(Client* client, psDRMessage* drmsg)
  {
!     if(!enabled)
          return;
      currUpdate = drmsg;
--- 33,37 ----
  void paladinJr::PredictClient(Client* client, psDRMessage* drmsg)
  {
!     if (!enabled)
          return;
      currUpdate = drmsg;
***************
*** 125,129 ****
  void paladinJr::CheckClient(Client* client)
  {
!     if(!enabled)
          return;
  
--- 125,129 ----
  void paladinJr::CheckClient(Client* client)
  {
!     if (!enabled)
          return;
  
***************
*** 132,136 ****
      currUpdate = NULL;
  
!     if(!checkClient)
          return;
  	csVector3 pos;
--- 132,136 ----
      currUpdate = NULL;
  
!     if (!checkClient)
          return;
  	csVector3 pos;
***************
*** 173,177 ****
  		WriteLog(buf.GetData());
  	}
! 	//if(posChange.y >= 0 && maxmove.y < 0)
  	//{
  	//	time_t curtime = time(NULL);
--- 173,177 ----
  		WriteLog(buf.GetData());
  	}
! 	//if (posChange.y >= 0 && maxmove.y < 0)
  	//{
  	//	time_t curtime = time(NULL);

Index: guildmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/guildmanager.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** guildmanager.cpp	26 Jun 2004 19:32:10 -0000	1.84
--- guildmanager.cpp	4 Jul 2004 04:46:56 -0000	1.85
***************
*** 171,175 ****
  GuildManager::~GuildManager()
  {
!     int i;
      
      for (i=0; i < notifySubscr.Length(); i++)
--- 171,175 ----
  GuildManager::~GuildManager()
  {
!     size_t i;
      
      for (i=0; i < notifySubscr.Length(); i++)
***************
*** 223,227 ****
  		{
  			psGuildMOTDSetMessage msg(me);
! 			if(!msg.valid)
  			{
  				Error2("Failed to parse psGuildMOTDSetMessage from client %u.",me->clientnum);
--- 223,227 ----
  		{
  			psGuildMOTDSetMessage msg(me);
! 			if (!msg.valid)
  			{
  				Error2("Failed to parse psGuildMOTDSetMessage from client %u.",me->clientnum);
***************
*** 357,361 ****
  void GuildManager::HandleMOTDSet(psGuildMOTDSetMessage& msg,Client *client)
  {
! 	if(Check...
 
[truncated message content]