[PlaneShift-svn] SF.net SVN: planeshift:[4147] trunk/src/server/groupmanager.cpp

[<wel...@us...>]

Revision: 4147
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4147&view=rev
Author:   weltall2
Date:     2009-07-29 05:13:06 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Fixed some problems with group challenges and messages from invitations being ignored by the server

Modified Paths:
--------------
    trunk/src/server/groupmanager.cpp

Modified: trunk/src/server/groupmanager.cpp
===================================================================
--- trunk/src/server/groupmanager.cpp	2009-07-29 00:15:25 UTC (rev 4146)
+++ trunk/src/server/groupmanager.cpp	2009-07-29 05:13:06 UTC (rev 4147)
@@ -402,7 +402,7 @@
     //Check for empty player name. If we don't do this, the server crashes
     if (PlayerName=="")
     {
-        psserver->SendSystemError(Challenger->GetClientNum(), "Please specify the player name to invite to your group.");
+        psserver->SendSystemError(Challenger->GetClientNum(), "Please specify the player name of a player in a group to challenge your group.");
         return;
     }
     
@@ -434,7 +434,7 @@
     
     if(ChallengerGroup == ChallengedGroup)
     {
-        psserver->SendSystemError(Challenger->GetClientNum(),"Your hroup cannot challenge itself.");
+        psserver->SendSystemError(Challenger->GetClientNum(),"Your group cannot challenge itself.");
         return;
     }
 
@@ -480,13 +480,13 @@
     csRef<PlayerGroup> ChallengerGroup = FindGroup(invite->groupID);
     if (!ChallengerGroup)
         return;
-
+        
     Client * ChallengedClient = clients->Find(invite->clientnum);
     if(!ChallengedClient)
         return;
         
     csRef<PlayerGroup> ChallengedGroup = ChallengedClient->GetActor()->GetGroup();
-    if(!ChallengedGroup || ChallengedGroup->IsLeader(ChallengedClient->GetActor()))
+    if(!ChallengedGroup || !ChallengedGroup->IsLeader(ChallengedClient->GetActor()))
         return;
 
     Client * ChallengerClient = clients->Find(invite->inviterClientNum);
@@ -500,8 +500,7 @@
 
     if (ChallengerClient != NULL)
         GroupChat(ChallengerClient->GetActor(),"%s's group is now in challenge with this group!",invite->inviteeName.GetData() );
-
-        GroupChat(ChallengedClient->GetActor(),"%s's group is now in challenge with this group!",invite->inviterName.GetData() );
+    GroupChat(ChallengedClient->GetActor(),"%s's group is now in challenge with this group!",invite->inviterName.GetData() );
 }
 
 bool GroupManager::AddGroupChallenge(PlayerGroup *ChallengerGroup, PlayerGroup *ChallengedGroup)
@@ -517,7 +516,14 @@
 {
     csRef<PlayerGroup> Group = Yielder->GetActor()->GetGroup();
     if(Group->IsLeader(Yielder->GetActor())) //only the group leader can yield to the group challengers
+    {
         Group->DuelYield();
+        psserver->SendSystemOK(Yielder->GetClientNum(), "Your group has yielded to all it's challengers.");
+    }
+    else
+    {
+        psserver->SendSystemError(Yielder->GetClientNum(), "Only the group leader can yield.");
+    }
 }
 
 void GroupManager::Invite(psGroupCmdMessage& msg,Client *inviter)
@@ -576,7 +582,6 @@
         group = NewGroup(inviter->GetActor());        
         psserver->SendSystemInfo(inviter->GetClientNum(),"You are group leader for the new group.");
     }
-    
 
     /**
      * Notify the inviter that the invitation has been sent.
@@ -777,7 +782,6 @@
     groups.Delete(group);
 }
 
-
 void GroupManager::GroupChat(gemActor * client, const char *fmt, ...)
 {
     csString text;
@@ -791,8 +795,7 @@
     if (groupmsg.valid)
     {
         groupmsg.msg->Reset();
-        Client *c = psserver->GetConnections()->Find(client->GetClientID());
-        chatserver->HandleMessage(groupmsg.msg,c);
+        groupmsg.FireEvent();
     }
     else
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.