[PlaneShift-svn] SF.net SVN: planeshift:[4410] stable

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

Revision: 4410
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4410&view=rev
Author:   weltall2
Date:     2009-09-16 22:25:42 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
a fix

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

Property Changed:
----------------
    stable/


Property changes on: stable
___________________________________________________________________
Modified: svn:mergeinfo
   - /personal/Xordan:1745,1812,1894,2270,2272,2283,2330,2333,2336
/trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133,2135-2465,2469,2472,2481,2487,2489,2497-2502,2507,2510-2512,2526,2528-2541,2543,2549,2551-2556,2558,2560-2561,2563-2564,2568,2570,2572,2574-2575,2577,2579,2581,2583,2604,2606-2607,2609,2611,2622,2628-2629,2631,2638-2639,2642,2661,2668,2670,2680,2685,2690,2696-2706,2709,2755,2765,2767,2786,2797,2799-2801,2805,2807-2808,2811,2813-2815,2826,2836,2848,2855,2879,2881,2883,2887,2891,2893,2908,2915-2916,2918,2920,2922,2925-2926,2931,2934,2947,3172,3178,3186-3187,3262,3264,3307,3450,3542,3591,3615,3649,3655,3657,3670-3671,3677-3678,3742-3743,3790,3838-3839,4095
   + /personal/Xordan:1745,1812,1894,2270,2272,2283,2330,2333,2336
/trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133,2135-2465,2469,2472,2481,2487,2489,2497-2502,2507,2510-2512,2526,2528-2541,2543,2549,2551-2556,2558,2560-2561,2563-2564,2568,2570,2572,2574-2575,2577,2579,2581,2583,2604,2606-2607,2609,2611,2622,2628-2629,2631,2638-2639,2642,2661,2668,2670,2680,2685,2690,2696-2706,2709,2755,2765,2767,2786,2797,2799-2801,2805,2807-2808,2811,2813-2815,2826,2836,2848,2855,2879,2881,2883,2887,2891,2893,2908,2915-2916,2918,2920,2922,2925-2926,2931,2934,2947,3172,3178,3186-3187,3262,3264,3307,3450,3542,3591,3615,3649,3655,3657,3670-3671,3677-3678,3742-3743,3790,3838-3839,4095,4401,4409

Modified: stable/src/server/exchangemanager.cpp
===================================================================
--- stable/src/server/exchangemanager.cpp	2009-09-16 22:19:38 UTC (rev 4409)
+++ stable/src/server/exchangemanager.cpp	2009-09-16 22:25:42 UTC (rev 4410)
@@ -368,6 +368,15 @@
         if (item && itemInSlot->exchangeStackCount > item->GetStackCount())
             return false;
     }
+    
+    //make sure offered money isn't an invalid amount (eg < 0)
+    if(offeringMoney.Get(MONEY_CIRCLES) < 0 ||
+        offeringMoney.Get(MONEY_OCTAS)  < 0 ||
+        offeringMoney.Get(MONEY_HEXAS)  < 0 ||
+        offeringMoney.Get(MONEY_TRIAS)  < 0)
+    {
+        return false;
+    }
 
     //Make sure offered money is really available
     psMoney characterMoney = chrinv->owner->Money();


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