[Planeshift-cvs] CVS: planeshift/src/server exchangemanager.cpp, 1.164, 1.165

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

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

Modified Files:
	exchangemanager.cpp 
Log Message:
- Fixed exchange messages "Vengeance gave Guest 5 Batters" now uses the correct number
 of offered items instead of the stackcount of the underlying inventory item.
- Changed "gave" messages to also just use First names to shorten them a bit.
- This fixes #2622 and perhaps #2579.
- I could not duplicate the report that the other party never gets quantity updates.
  I got all offered quantity updates here.

Index: exchangemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/exchangemanager.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** exchangemanager.cpp	21 Apr 2007 07:45:16 -0000	1.164
--- exchangemanager.cpp	24 Apr 2007 05:19:32 -0000	1.165
***************
*** 603,607 ****
          if (item != NULL)
          {
!             text += item->GetQuantityName();
              text += ", ";
          }
--- 603,607 ----
          if (item != NULL)
          {
!             text += item->GetQuantityName(item->GetName(),itemInSlot->exchangeStackCount);
              text += ", ";
          }
***************
*** 1118,1123 ****
          if (playerChar.GetExchangedItems(itemsOffered))
          {
!             psserver->SendSystemBaseInfo( targetClient->GetClientNum(), "%s gave %s %s.", starterClient->GetActor()->GetName(), targetClient->GetActor()->GetName(), itemsOffered.GetData());                             // RMS: Trade cancelled without items being offered
!             psserver->SendSystemBaseInfo( starterClient->GetClientNum(), "%s gave %s %s.", starterClient->GetActor()->GetName(), targetClient->GetActor()->GetName(), itemsOffered.GetData());                            // RMS: Trade cancelled without items being offered
          }
  
--- 1118,1123 ----
          if (playerChar.GetExchangedItems(itemsOffered))
          {
!             psserver->SendSystemBaseInfo( targetClient->GetClientNum(), "%s gave %s %s.", starterClient->GetName(), targetClient->GetName(), itemsOffered.GetData());                             // RMS: Trade cancelled without items being offered
!             psserver->SendSystemBaseInfo( starterClient->GetClientNum(), "%s gave %s %s.", starterClient->GetName(), targetClient->GetName(), itemsOffered.GetData());                            // RMS: Trade cancelled without items being offered
          }
  
***************
*** 1125,1130 ****
          if (targetChar.GetExchangedItems(itemsOffered))
          {
!             psserver->SendSystemBaseInfo( targetClient->GetClientNum(), "%s gave %s %s.", targetClient->GetActor()->GetName(), starterClient->GetActor()->GetName(), itemsOffered.GetData());                             // RMS: Trade cancelled without items being offered
!             psserver->SendSystemBaseInfo( starterClient->GetClientNum(), "%s gave %s %s.", targetClient->GetActor()->GetName(), starterClient->GetActor()->GetName(), itemsOffered.GetData());                            // RMS: Trade cancelled without items being offered
          }
  
--- 1125,1130 ----
          if (targetChar.GetExchangedItems(itemsOffered))
          {
!             psserver->SendSystemBaseInfo( targetClient->GetClientNum(), "%s gave %s %s.", targetClient->GetName(), starterClient->GetName(), itemsOffered.GetData());                             // RMS: Trade cancelled without items being offered
!             psserver->SendSystemBaseInfo( starterClient->GetClientNum(), "%s gave %s %s.", targetClient->GetName(), starterClient->GetName(), itemsOffered.GetData());                            // RMS: Trade cancelled without items being offered
          }