[Planeshift-cvs] CVS: planeshift/src/server groupmanager.cpp,1.23,1.24 guildmanager.cpp,1.77,1.78 usermanager.cpp,1.115,1.116

[Ondrej H. <tan...@us...>]

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

Modified Files:
	groupmanager.cpp guildmanager.cpp usermanager.cpp 
Log Message:
- Changes to Invites:
  - All psInvitationMessages now carry type of invitation (e.g. duel, guild join, ...)
  - When one player challenges other to a duel then the invitee's client can automatically
    accept/reject this invitation according to configuration (in pawsConfigPvP)
  - Removed invitation handling from psGuildCommands.
  - Removed pawsGuildJoinWindow from cvs.
  - Moved invitation handling to new class psInviteClient.


Index: groupmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/groupmanager.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** groupmanager.cpp	13 Mar 2004 08:58:04 -0000	1.23
--- groupmanager.cpp	13 Mar 2004 18:39:37 -0000	1.24
***************
*** 55,59 ****
                          "You have joined the group.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.")
      {
          group   = g;
--- 55,60 ----
                          "You have joined the group.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.",
!                         psInvitationMessage::groupJoin)
      {
          group   = g;

Index: guildmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/guildmanager.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** guildmanager.cpp	13 Mar 2004 16:49:07 -0000	1.77
--- guildmanager.cpp	13 Mar 2004 18:39:37 -0000	1.78
***************
*** 62,66 ****
                          "You have joined the guild.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.")
      {
          this->guildID = guildID;
--- 62,67 ----
                          "You have joined the guild.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.", 
!                         psInvitationMessage::guildJoin)
      {
          this->guildID = guildID;
***************
*** 91,95 ****
                          "You have accepted %s's challenge.",
                          "%s has declined your challenge.",
!                         "You have declined %s's challenge.")
      {
      }
--- 92,97 ----
                          "You have accepted %s's challenge.",
                          "%s has declined your challenge.",
!                         "You have declined %s's challenge.",
!                         psInvitationMessage::guildWar)
      {
      }
***************
*** 1659,1663 ****
                          "You have joined the alliance.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.")
      {
          this->allianceID = allianceID;
--- 1661,1666 ----
                          "You have joined the alliance.",
                          "%s has declined your invitation.",
!                         "You have declined %s's invitation.",
!                         psInvitationMessage::allianceJoin)
      {
          this->allianceID = allianceID;

Index: usermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** usermanager.cpp	13 Mar 2004 08:58:06 -0000	1.115
--- usermanager.cpp	13 Mar 2004 18:39:37 -0000	1.116
***************
*** 97,101 ****
                          "You have accepted %s's challenge.",
                          "%s has declined your challenge.",
!                         "You have declined %s's challenge.")
      {
      }
--- 97,101 ----
                          "You have accepted %s's challenge.",
                          "%s has declined your challenge.",
!                         "You have declined %s's challenge.", psInvitationMessage::duel)
      {
      }