[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.368,1.369 messages.h,1.347,1.348

[Arianna B. <ar...@us...>]

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

Modified Files:
	messages.cpp messages.h 
Log Message:
Fixed bug #1497 and removed psMarriageMsgDetails

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.368
retrieving revision 1.369
diff -C2 -d -r1.368 -r1.369
*** messages.cpp	26 Feb 2006 19:55:52 -0000	1.368
--- messages.cpp	6 Mar 2006 06:28:09 -0000	1.369
***************
*** 139,143 ****
  
  // ---------------------------------------------------------------------------
! 
  PSF_IMPLEMENT_MSG_FACTORY(psMarriageMsgDetails,MSGTYPE_MARRIAGE_DETAILS);
  
--- 139,143 ----
  
  // ---------------------------------------------------------------------------
! /*
  PSF_IMPLEMENT_MSG_FACTORY(psMarriageMsgDetails,MSGTYPE_MARRIAGE_DETAILS);
  
***************
*** 165,169 ****
  }
  
! csString psMarriageMsgDetails::ToString(AccessPointers * /*access_ptrs*/)
  {
      csString msgtext;
--- 165,169 ----
  }
  
! csString psMarriageMsgDetails::ToString(AccessPointers * //access_ptrs)
  {
      csString msgtext;
***************
*** 174,178 ****
      return msgtext;
  }
! 
  // ---------------------------------------------------------------------------
  
--- 174,178 ----
      return msgtext;
  }
! */
  // ---------------------------------------------------------------------------
  
***************
*** 1590,1598 ****
          return;
      }
-     else if (command == "/viewall")
-     {
-         action = words[words.GetCount()-1];
-         return;
-     }
      valid = false;
  }
--- 1590,1593 ----
***************
*** 4345,4351 ****
      
      msg->Add( (uint8_t)REQUEST );
!     msg->Add( (int32_t)containerID );
      msg->Add( (uint32_t)slotID );     
!     msg->Add( (int32_t)parentContainerID );
  }
  
--- 4340,4347 ----
      
      msg->Add( (uint8_t)REQUEST );
!     msg->Add( (int32_t)containerID );    
! 
      msg->Add( (uint32_t)slotID );     
!     msg->Add( (int32_t)parentContainerID );   
  }
  
***************
*** 4407,4411 ****
      msg->Add( itemDescription );
      msg->Add( itemIcon );
!     msg->Add( (int32_t)containerID );
      msg->Add( (uint32_t)contents.Length() );
      for ( size_t n = 0; n < contents.Length(); n++ )
--- 4403,4407 ----
      msg->Add( itemDescription );
      msg->Add( itemIcon );
!     msg->Add( (int32_t)containerID ); 
      msg->Add( (uint32_t)contents.Length() );
      for ( size_t n = 0; n < contents.Length(); n++ )
***************
*** 4415,4419 ****
          msg->Add( (uint32_t)contents[n].slotID );
          msg->Add( (uint32_t)contents[n].stackCount );
!     }            
  }
  
--- 4411,4415 ----
          msg->Add( (uint32_t)contents[n].slotID );
          msg->Add( (uint32_t)contents[n].stackCount );
!     }                
  }
  

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.347
retrieving revision 1.348
diff -C2 -d -r1.347 -r1.348
*** messages.h	26 Feb 2006 19:55:52 -0000	1.347
--- messages.h	6 Mar 2006 06:28:11 -0000	1.348
***************
*** 447,451 ****
  
  /** The message is sent when someone requests marriage details of a player */
! class psMarriageMsgDetails : public psMessageCracker
  {
  public:
--- 447,451 ----
  
  /** The message is sent when someone requests marriage details of a player */
! /*class psMarriageMsgDetails : public psMessageCracker
  {
  public:
***************
*** 454,458 ****
  
      PSF_DECLARE_MSG_FACTORY();
! 
      /**
       * Convert the message into human readable string.
--- 454,458 ----
  
      PSF_DECLARE_MSG_FACTORY();
! */
      /**
       * Convert the message into human readable string.
***************
*** 460,469 ****
       * @param access_ptrs A struct to a number of access pointers.
       * @return Return a human readable string for the message.
!      */
      virtual csString ToString(AccessPointers * access_ptrs);
  
      csString charName;   /// Name of character whose details are wanted
      csString spouseName; /// Name of spouse of character whose details are wanted
! };
  
  /**
--- 460,469 ----
       * @param access_ptrs A struct to a number of access pointers.
       * @return Return a human readable string for the message.
!      *//*
      virtual csString ToString(AccessPointers * access_ptrs);
  
      csString charName;   /// Name of character whose details are wanted
      csString spouseName; /// Name of spouse of character whose details are wanted
! };*/
  
  /**