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

[<mg...@us...>]

Revision: 1754
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1754&view=rev
Author:   mgist
Date:     2008-06-14 04:02:13 -0700 (Sat, 14 Jun 2008)

Log Message:
-----------
- Merged r1753 from trunk.

Modified Paths:
--------------
    stable/docs/history.txt
    stable/src/server/gem.cpp

Modified: stable/docs/history.txt
===================================================================
--- stable/docs/history.txt	2008-06-14 00:14:36 UTC (rev 1753)
+++ stable/docs/history.txt	2008-06-14 11:02:13 UTC (rev 1754)
@@ -1,3 +1,6 @@
+*** 2008-06-14 by Kenny Graunke
+- Commit patch for part of FS#74.
+
 *** 2008-06-13 by Mike Gist
 - Fixed crash if more than one psAuthApprovedMessage is received.
 

Modified: stable/src/server/gem.cpp
===================================================================
--- stable/src/server/gem.cpp	2008-06-14 00:14:36 UTC (rev 1753)
+++ stable/src/server/gem.cpp	2008-06-14 11:02:13 UTC (rev 1754)
@@ -3952,17 +3952,15 @@
      * and fake the stack count before calling AddToContainer with the test flag;
      * we put it back when we're done. */
 
-	float currentSize = 0;
+	uint currentSize = 0;
     gemContainer::psContainerIterator iter(this);
     while (iter.HasNext())
     {
         psItem* child = iter.Next();
         currentSize += child->GetTotalStackSize();
     }
-    if(((item->GetItemSize())*amountToAdd + currentSize) > itemdata->GetContainerMaxSize())
-	{
+    if (item->GetItemSize()*amountToAdd + currentSize > itemdata->GetContainerMaxSize())
         return false;
-	}
 
 
     unsigned short savedCount = item->GetStackCount();


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