[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.287,1.288 messages.h,1.287,1.288

[DivineLight <its...@us...>]

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

Modified Files:
	messages.cpp messages.h 
Log Message:
made marriageManager/marriageHandler to use Question client.

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.287
retrieving revision 1.288
diff -C2 -d -r1.287 -r1.288
*** messages.cpp	8 Aug 2005 01:31:46 -0000	1.287
--- messages.cpp	14 Aug 2005 12:06:39 -0000	1.288
***************
*** 104,171 ****
  }
  
- psMarriageMsgConfirm::psMarriageMsgConfirm( const char* proposer, 
- 										 const char* proposeMessage, 
- 										 uint32_t clientNum )
- {
- 	CS_ASSERT(proposer); CS_ASSERT(proposeMessage);
- 
- 	msg = new MsgEntry( strlen(proposer) + strlen(proposeMessage) + 2 ); 
- 
- 	msg->SetType( MSG_MARRIAGE_CONFIRM );
-     msg->clientnum = clientNum;
- 	msg->Add( proposer );
- 	msg->Add( proposeMessage );
- 	
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgConfirm::psMarriageMsgConfirm(MsgEntry* message)
- {
- 	CS_ASSERT(message);
- 
- 	proposerName   = message->GetStr();
- 	proposeMsg     = message->GetStr();
- }
- 
- psMarriageMsgAccept::psMarriageMsgAccept( const char* charName, uint32_t clientNum )
- {
- 	CS_ASSERT(charName);
- 
- 	msg = new MsgEntry( strlen(charName) + 1 ); 
- 
- 	msg->SetType( MSG_MARRIAGE_ACCEPT );
-     msg->clientnum = clientNum;
- 	msg->Add( charName );
- 		
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgAccept::psMarriageMsgAccept(MsgEntry* message)
- {
- 	CS_ASSERT(message);
- 
- 	charName   = message->GetStr();
- }
- 
- psMarriageMsgReject::psMarriageMsgReject( const char* charName, uint32_t clientNum )
- {
- 	CS_ASSERT(charName);
- 
- 	msg = new MsgEntry( strlen(charName) + 1 ); 
- 
- 	msg->SetType( MSG_MARRIAGE_REJECT );
-     msg->clientnum = clientNum;
- 	msg->Add( charName );
- 		
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgReject::psMarriageMsgReject(MsgEntry* message)
- {
- 	CS_ASSERT(message);
- 
- 	charName   = message->GetStr();
- }
- 
  psMarriageMsgDetails::psMarriageMsgDetails( const char* charName, 
  							const char* spouseName, uint32_t clientNum )
--- 104,107 ----
***************
*** 3879,3885 ****
  	case MSG_MARRIAGE_PROPOSE: return "MSG_MARRIAGE_PROPOSE";
  	case MSG_MARRIAGE_DIVORCE: return "MSG_MARRIAGE_DIVORCE";
- 	case MSG_MARRIAGE_ACCEPT: return "MSG_MARRIAGE_ACCEPT";
- 	case MSG_MARRIAGE_REJECT: return "MSG_MARRIAGE_REJECT";
- 	case MSG_MARRIAGE_CONFIRM: return "MSG_MARRIAGE_CONFIRM";
  	case MSG_MARRIAGE_DETAILS: return "MSG_MARRIAGE_DETAILS";
      default: return csString().Format("unknown (type=%i)", msgType);
--- 3815,3818 ----

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.287
retrieving revision 1.288
diff -C2 -d -r1.287 -r1.288
*** messages.h	8 Aug 2005 01:31:46 -0000	1.287
--- messages.h	14 Aug 2005 12:06:39 -0000	1.288
***************
*** 218,224 ****
  	MSG_MARRIAGE_PROPOSE,
  	MSG_MARRIAGE_DIVORCE,
- 	MSG_MARRIAGE_ACCEPT,
- 	MSG_MARRIAGE_REJECT,
- 	MSG_MARRIAGE_CONFIRM,
  	MSG_MARRIAGE_DETAILS
  };
--- 218,221 ----
***************
*** 313,348 ****
  };
  
! /** The message sent to confirm a marriage proposal from person being proposed */
! class psMarriageMsgConfirm : public psMessageCracker
! {
! public:
!     psMarriageMsgConfirm( const char* proposer, const char* proposeMessage, uint32_t clientNum = 0 );
!     psMarriageMsgConfirm( MsgEntry* message );
! 
! 	csString proposerName; /// Name of the player which is sending proposal
! 	csString proposeMsg;   /// Proposing Message
! };
! 
! /** The message sent when someone accepts a marriage proposal */
! class psMarriageMsgAccept : public psMessageCracker
! {
! public:
!     psMarriageMsgAccept( const char* charName, uint32_t clientNum = 0 );
!     psMarriageMsgAccept( MsgEntry* message );
! 
!     csString charName;	/// Name of Proposer or Acceptor
! };
! 
! /** The message sent when someone rejects a marriage proposal */
! class psMarriageMsgReject : public psMessageCracker
! {
! public:
!     psMarriageMsgReject( const char* charName, uint32_t clientNum = 0 );
!     psMarriageMsgReject( MsgEntry* message );
! 
! 	csString charName;	/// Name of Proposer or Rejecor
! };
! 
! /** The message sent when someone rejects a marriage proposal */
  class psMarriageMsgDetails : public psMessageCracker
  {
--- 310,314 ----
  };
  
! /** The message is sent when someone requests marriage details of a player */
  class psMarriageMsgDetails : public psMessageCracker
  {