[Planeshift-cvs] CVS: planeshift/src/client/gui inventorywindow.cpp,1.69,1.70 inventorywindow.h,1.23,1.24

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26595/src/client/gui

Modified Files:
	inventorywindow.cpp inventorywindow.h 
Log Message:
Removed the stack count and replaced it with total carry capacity based on a MathScript in rpgrules.xml

Index: inventorywindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/inventorywindow.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** inventorywindow.cpp	26 Feb 2005 23:32:42 -0000	1.69
--- inventorywindow.cpp	28 Feb 2005 23:45:57 -0000	1.70
***************
*** 242,249 ****
          case MSGTYPEGUIINVENTORY:
          {            
-             Error1("received inventory");
              ClearInventory();
              psGUIInventoryMessage incomming(me);
              float itemWeight = 0.0;
  
              for ( int z = 0; z < incomming.totalItems; z++ )
--- 242,249 ----
          case MSGTYPEGUIINVENTORY:
          {            
              ClearInventory();
              psGUIInventoryMessage incomming(me);
              float itemWeight = 0.0;
+             float totalSize = 0.0;
  
              for ( int z = 0; z < incomming.totalItems; z++ )
***************
*** 280,285 ****
--- 280,287 ----
                  
                  itemWeight += incomming.items[z].weight;
+                 totalSize  +=incomming.items[z].size;
              } 
  
+             WindowManager()->Publish( "fcurrcap", totalSize ); 
              
              money->Set(incomming.money);
***************
*** 297,302 ****
  {
      pawsInventoryDollView* widget = dynamic_cast <pawsInventoryDollView*> (FindWidget("InventoryDoll"));
-     
-     printf( "Attaching Mesh to doll\n");
      if (widget)
          psengine->Attach( widget->GetObject(), psengine->slotName.GetName(slot), mesh );    
--- 299,302 ----
***************
*** 307,311 ****
  void pawsInventoryWindow::RemoveMeshFromDoll( int slot )
  {
-     printf("Remove mesh from doll\n");
      pawsInventoryDollView* widget = dynamic_cast <pawsInventoryDollView*> (FindWidget("InventoryDoll"));
      if (widget)
--- 307,310 ----

Index: inventorywindow.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/inventorywindow.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** inventorywindow.h	20 Jan 2005 12:07:37 -0000	1.23
--- inventorywindow.h	28 Feb 2005 23:45:58 -0000	1.24
***************
*** 126,129 ****
--- 126,130 ----
      pawsTextBox* weight;
      
+     
      pawsMoney * money;