[Planeshift-cvs] CVS: planeshift/src/server guildmanager.cpp,1.98,1.99 usermanager.cpp,1.144,1.145

[Christian S. <blu...@us...>]

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

Modified Files:
	guildmanager.cpp usermanager.cpp 
Log Message:
- Commited fix from Pogopuschel: Where the guild name wasn't check when removing the guild
- Added setting mode to PEACE in the "multiple actors, main actor dead" combat

Index: guildmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/guildmanager.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** guildmanager.cpp	27 Oct 2004 16:10:52 -0000	1.98
--- guildmanager.cpp	29 Oct 2004 18:49:09 -0000	1.99
***************
*** 1045,1048 ****
--- 1045,1054 ----
              return;
  
+     if (!guild->GetName().CompareNoCase(msg.guildname))
+     {
+         psserver->SendSystemError(clientnum,"The guild name you specified did not match the guild you are in. The guild was not disbanded.");
+         return;
+     }
+ 
      if (!guild->RemoveGuild() )
      {

Index: usermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** usermanager.cpp	29 Oct 2004 02:23:55 -0000	1.144
--- usermanager.cpp	29 Oct 2004 18:49:09 -0000	1.145
***************
*** 501,504 ****
--- 501,505 ----
              winner->RemoveDuelClient(client->GetClientNum());
              client->RemoveDuelClient(winner->GetClientNum());
+             client->GetActor()->SetMode(PSCHARACTER_MODE_PEACE);
              combatmanager->StopAttack(client->GetActor());
          }