[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp, 1.406, 1.407 messages.h, 1.375, 1.376

[DaveG <da...@us...>]

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

Modified Files:
	messages.cpp messages.h 
Log Message:
- Switched marriage command to use standard user command messages, instead of needing its own
  message types, and removed the client's marriage handler in favor of using the standard question
  client for divorce confirmation. (handler only handled that, and a bunch of unused vars;
  the client doesn't need to do anything special here to need all this anymore) => NETVERSION BUMP

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.406
retrieving revision 1.407
diff -C2 -d -r1.406 -r1.407
*** messages.cpp	16 Jun 2006 22:25:55 -0000	1.406
--- messages.cpp	17 Jun 2006 22:21:43 -0000	1.407
***************
*** 72,174 ****
  // ---------------------------------------------------------------------------
  
- PSF_IMPLEMENT_MSG_FACTORY(psMarriageMsgPropose,MSGTYPE_MARRIAGE_PROPOSE);
- 
- psMarriageMsgPropose::psMarriageMsgPropose( const char* charName, 
-         const char* proposeMessage, uint32_t clientNum )
- {
-     CS_ASSERT(charName); CS_ASSERT(proposeMessage);
- 
-     msg = new MsgEntry( strlen(charName) + strlen(proposeMessage) + 2 ); 
- 
-     msg->SetType( MSGTYPE_MARRIAGE_PROPOSE );
-     msg->clientnum = clientNum;
-     msg->Add( charName );
-     msg->Add( proposeMessage );
-     
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgPropose::psMarriageMsgPropose(MsgEntry* message)
- {
-     CS_ASSERT(message);
- 
-     charName         = message->GetStr();
-     proposeMsg       = message->GetStr();
- }
- 
- csString psMarriageMsgPropose::ToString(AccessPointers * /*access_ptrs*/)
- {
-     csString msgtext;
-     
-     msgtext.AppendFmt("CharName: '%s'",charName.GetDataSafe() );
-     msgtext.AppendFmt(" ProposeMsg: '%s'",proposeMsg.GetDataSafe() );
- 
-     return msgtext;
- }
- 
- // ---------------------------------------------------------------------------
- 
- PSF_IMPLEMENT_MSG_FACTORY(psMarriageMsgDivorce,MSGTYPE_MARRIAGE_DIVORCE);
- 
- psMarriageMsgDivorce::psMarriageMsgDivorce( const char* divorceMessage, uint32_t clientNum )
- {
-     CS_ASSERT(divorceMessage);
- 
-     msg = new MsgEntry( strlen(divorceMessage) + 1 ); 
- 
-     msg->SetType( MSGTYPE_MARRIAGE_DIVORCE );
-     msg->clientnum = clientNum;
-     msg->Add( divorceMessage );
-     
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgDivorce::psMarriageMsgDivorce(MsgEntry* message)
- {
-     CS_ASSERT(message);
- 
-     divorceMsg   = message->GetStr();
- }
- 
- csString psMarriageMsgDivorce::ToString(AccessPointers * /*access_ptrs*/)
- {
-     csString msgtext;
-     
-     msgtext.AppendFmt("DivorceMsg: '%s'", divorceMsg.GetDataSafe());
- 
-     return msgtext;
- }
- 
- 
- // ---------------------------------------------------------------------------
- 
- PSF_IMPLEMENT_MSG_FACTORY(psMarriageMsgDivorceConfirm,MSGTYPE_MARRIAGE_DIVORCE_CONFIRM);
- 
- psMarriageMsgDivorceConfirm::psMarriageMsgDivorceConfirm( uint32_t clientNum )
- {
-     msg = new MsgEntry( 1 ); 
- 
-     msg->SetType( MSGTYPE_MARRIAGE_DIVORCE_CONFIRM );
-     msg->clientnum = clientNum;
-         
-     valid = !(msg->overrun );
- }
- 
- psMarriageMsgDivorceConfirm::psMarriageMsgDivorceConfirm(MsgEntry* message)
- {
-     CS_ASSERT(message);
- }
- 
- csString psMarriageMsgDivorceConfirm::ToString(AccessPointers * /*access_ptrs*/)
- {
-     csString msgtext;
- 
-     msgtext.AppendFmt("Ok!");
- 
-     return msgtext;
- }
- 
- // ---------------------------------------------------------------------------
- 
  PSF_IMPLEMENT_MSG_FACTORY(psCharDeleteMessage,MSGTYPE_CHAR_DELETE);
  
--- 72,75 ----
***************
*** 1348,1351 ****
--- 1249,1266 ----
          return;
      }
+     if ( command == "/marriage" )
+     {
+         action = words.Get(1);
+         if ( action == "propose" )
+         {
+             player = words.Get(2);
+             text = words.GetTail(3);
+         }
+         else if ( action == "divorce" )
+         {
+             text = words.GetTail(2);
+         }
+         return;
+     }
  
      valid = false;
***************
*** 1357,1361 ****
      
  	msgtext.AppendFmt("Command: '%s'", command.GetDataSafe());
! 	if (command == "/who" || command == "/buddylist" || 
  			command == "/advisormode" || command == "/sit")
  	{
--- 1272,1276 ----
      
  	msgtext.AppendFmt("Command: '%s'", command.GetDataSafe());
! 	if (command == "/who" || command == "/buddylist" ||
  			command == "/advisormode" || command == "/sit")
  	{
***************
*** 1379,1382 ****
--- 1294,1305 ----
  		return msgtext;
  	}
+ 	if (command == "/marriage")
+ 	{
+ 		msgtext.AppendFmt("Action: %s ", action.GetData());
+ 		if (player.Length())
+ 		    msgtext.AppendFmt("Player: %s ", player.GetData());
+         msgtext.AppendFmt("Message: %s", text.GetData());
+ 		return msgtext;
+ 	}
  	if (command == "/spawn" || command == "/unstick" ||
           command == "/die" || command == "/loot" ||

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.375
retrieving revision 1.376
diff -C2 -d -r1.375 -r1.376
*** messages.h	16 Jun 2006 22:25:55 -0000	1.375
--- messages.h	17 Jun 2006 22:21:43 -0000	1.376
***************
*** 42,46 ****
  // This holds the version number of the network code, remember to increase
  // this each time you do an update which breaks compatibility
! #define PS_NETVERSION   0x0064
  // Remember to bump the version in pscssetup.h, as well.
  
--- 42,46 ----
  // This holds the version number of the network code, remember to increase
  // this each time you do an update which breaks compatibility
! #define PS_NETVERSION   0x0065
  // Remember to bump the version in pscssetup.h, as well.
  
***************
*** 216,228 ****
      MSGTYPE_PET_SKILL,
  
-     // Marriage related messages
-     MSGTYPE_MARRIAGE_PROPOSE,
-     MSGTYPE_MARRIAGE_DIVORCE,
-     MSGTYPE_MARRIAGE_DIVORCE_CONFIRM,
-     
      MSGTYPE_CRAFT_INFO,
  
      MSGTYPE_UPDATE_CHECK,
!     MSGTYPE_PETITION_REQUEST,   // 140
      MSGTYPE_HEART_BEAT,
      MSGTYPE_PERSIST_ACTOR_REQUEST
--- 216,223 ----
      MSGTYPE_PET_SKILL,
  
      MSGTYPE_CRAFT_INFO,
  
      MSGTYPE_UPDATE_CHECK,
!     MSGTYPE_PETITION_REQUEST,
      MSGTYPE_HEART_BEAT,
      MSGTYPE_PERSIST_ACTOR_REQUEST
***************
*** 1048,1056 ****
  {
  public:
!     csString command,player,filter;
      int dice,sides;
      int level,mode;
  
- 
      psUserCmdMessage(const char *cmd);
      psUserCmdMessage(MsgEntry *message);
--- 1043,1050 ----
  {
  public:
!     csString command,player,filter,action,text;
      int dice,sides;
      int level,mode;
  
      psUserCmdMessage(const char *cmd);
      psUserCmdMessage(MsgEntry *message);