[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.153,1.154 messages.h,1.159,1.160

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

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

Modified Files:
	messages.cpp messages.h 
Log Message:
More updates to exchange manager. ( Still a bit broken but almost fixed ). 
Added OnMouseEnter/Exit functions to PAWS. 

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** messages.cpp	29 Mar 2004 22:47:50 -0000	1.153
--- messages.cpp	30 Mar 2004 00:54:48 -0000	1.154
***************
*** 2415,2416 ****
--- 2415,2466 ----
  
  //------------------------------------------------------------------------------
+ psExchangeAddItemMsg::psExchangeAddItemMsg( uint32_t clientNum,
+                                             csString& name,
+                                             int containerID,
+                                             int slot,
+                                             int stackcount,                            
+                                             csString& icon )
+ {                                          
+     msg = new MsgEntry(1000);
+     msg->data->type = MSG_TYPE_EXCHANGE_ADD_ITEM;
+     msg->clientnum = clientNum;
+     
+     msg->Add( name );
+     msg->Add( (uint32_t) containerID );
+     msg->Add( (uint32_t) slot );    
+     msg->Add( (uint32_t) stackcount );    
+     msg->Add( icon );
+     msg->ClipToCurrentSize();
+ }
+ 
+ psExchangeAddItemMsg::psExchangeAddItemMsg( MsgEntry* me )
+ {
+     name        = me->GetStr();
+     container   = me->GetUInt32();
+     slot        = me->GetUInt32();
+     stackCount  = me->GetUInt32();
+     icon        = me->GetStr();        
+ }
+ 
+ //------------------------------------------------------------------------------
+ 
+ psExchangeRemoveItemMsg::psExchangeRemoveItemMsg( uint32_t client, int container, int slot, int newStack )
+ {
+     msg = new MsgEntry( sizeof( int ) * 3 );
+     msg->data->type = MSG_TYPE_EXCHANGE_REMOVE_ITEM;
+     msg->clientnum = client;
+     
+     msg->Add( (uint32_t)container );
+     msg->Add( (uint32_t)slot );
+     msg->Add( (uint32_t)newStack );
+ }
+ 
+ psExchangeRemoveItemMsg::psExchangeRemoveItemMsg( MsgEntry* msg )
+ {
+     container       = msg->GetUInt32();
+     slot            = msg->GetUInt32();
+     newStackCount   = msg->GetUInt32();
+ }    
+     
+ 
+     

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** messages.h	25 Mar 2004 11:22:21 -0000	1.159
--- messages.h	30 Mar 2004 00:54:48 -0000	1.160
***************
*** 44,48 ****
      CONTAINER_INVENTORY_EQUIPMENT = -2,        
      CONTAINER_EXCHANGE_OFFERING  = -3,
!     CONTAINER_WORLD = -4
  };
  
--- 44,49 ----
      CONTAINER_INVENTORY_EQUIPMENT = -2,        
      CONTAINER_EXCHANGE_OFFERING  = -3,
!     CONTAINER_EXCHANGE_RECEIVING  = -4,
!     CONTAINER_WORLD = -5
  };
  
***************
*** 88,91 ****
--- 89,94 ----
      MSGTYPEGUIEXCHANGE,
      MSG_TYPE_EXCHANGE_REQUEST,
+     MSG_TYPE_EXCHANGE_ADD_ITEM,
+     MSG_TYPE_EXCHANGE_REMOVE_ITEM,     
      MSGTYPEGUIMERCHANT,
      MSGTYPEGROUPCMD,
***************
*** 1840,1842 ****
--- 1843,1885 ----
      csString newValue;
  };
+ 
+ /** Notification of an item added to an exchange.  This should only be from 
+   * server to client.  It is a message to update the Exchange window.
+   */
+ class psExchangeAddItemMsg : public psMessageCracker
+ {
+ public:
+     psExchangeAddItemMsg(   uint32_t clientNum,
+                             csString& name,
+                             int containerID,
+                             int slot,
+                             int stackcount,                            
+                             csString& icon );
+     
+     psExchangeAddItemMsg( MsgEntry* me );
+     
+     csString name;
+     int container;
+     int slot;
+     int stackCount;
+     csString icon;                                                        
+ };
+ 
+ //------------------------------------------------------------------------------
+ 
+ /** Notification of an item removed from an exchange.  This should only be from 
+   * server to client.  It is a message to update the Exchange window.
+   */
+ class psExchangeRemoveItemMsg : public psMessageCracker
+ {
+ public:
+     psExchangeRemoveItemMsg( uint32_t client, int container, int slot, int newStack );
+     psExchangeRemoveItemMsg( MsgEntry* me );
+         
+     int container;          // CONTAINER_EXCHANGE_*
+     int slot;               
+     int newStackCount;    
+ };
+ 
+ 
  #endif