[PlaneShift-svn] SF.net SVN: planeshift:[5114] trunk/src/server/exchangemanager.cpp

[<wel...@us...>]

Revision: 5114
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5114&view=rev
Author:   weltall2
Date:     2009-12-30 21:33:39 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
fixed  PS#3737 - wrong error message - too few items for quest (too many)  patch by Suilensh

Modified Paths:
--------------
    trunk/src/server/exchangemanager.cpp

Modified: trunk/src/server/exchangemanager.cpp
===================================================================
--- trunk/src/server/exchangemanager.cpp	2009-12-30 21:25:25 UTC (rev 5113)
+++ trunk/src/server/exchangemanager.cpp	2009-12-30 21:33:39 UTC (rev 5114)
@@ -1575,7 +1575,15 @@
                 psItem *invItem = client->GetCharacterData()->Inventory().GetInventoryIndexItem(foundIndex);
                 if (invItem->GetStackCount() < itemCount || invItem->GetStackCount() > itemCount || client->GetCharacterData()->Inventory().FindItemStatIndex(itemstat,foundIndex+1) != SIZET_NOT_FOUND)
                 {
-                    psserver->SendSystemError(client->GetClientNum(), "You must give the items manually because you have too many %s.",itemName.GetData() );
+					// Distinguish the cases from each other in order to send out the correct error message
+					if (invItem->GetStackCount() < itemCount)
+					{
+						psserver->SendSystemError(client->GetClientNum(), "You have too few %s.  Come back when you have the correct amount.", itemName.GetData());
+					}
+					else
+					{
+						psserver->SendSystemError(client->GetClientNum(), "You must give the items manually because you have too many %s.", itemName.GetData());
+					}
                     HandleExchangeEnd(NULL,client);
                     break;
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.