[PlaneShift-svn] SF.net SVN: planeshift:[8667] trunk/src/server

[<ma...@us...>]

Revision: 8667
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8667&view=rev
Author:   magodra
Date:     2013-04-03 18:58:56 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
- Fixed (PS#5964) frozen by GM displayed while using forzen spell.

Modified Paths:
--------------
    trunk/src/server/exchangemanager.cpp
    trunk/src/server/usermanager.cpp

Modified: trunk/src/server/exchangemanager.cpp
===================================================================
--- trunk/src/server/exchangemanager.cpp	2013-04-03 18:22:37 UTC (rev 8666)
+++ trunk/src/server/exchangemanager.cpp	2013-04-03 18:58:56 UTC (rev 8667)
@@ -1381,7 +1381,7 @@
     {
         if (errorMessage)
         {
-            *errorMessage = "You can't trade while being frozen by a GM";
+            *errorMessage = "You can't trade while being frozen.";
         }
         return false;
     }
@@ -1390,7 +1390,7 @@
     {
         if (errorMessage)
         {
-            *errorMessage = "You are already busy with another trade" ;
+            *errorMessage = "You are already busy with another trade." ;
         }
         return false;
     }
@@ -1488,19 +1488,19 @@
 
         if ( client == targetClient )
         {
-            psserver->SendSystemError(client->GetClientNum(),"You can not trade with yourself");
+            psserver->SendSystemError(client->GetClientNum(),"You can not trade with yourself.");
             return;
         }
 
         if(targetClient->GetActor()->IsFrozen())
         {
-            psserver->SendSystemInfo(client->GetClientNum(), "%s was frozen by a GM and cannot trade", target->GetName());
+            psserver->SendSystemInfo(client->GetClientNum(), "%s was frozen and cannot trade.", target->GetName());
             return;
         }
 
         if ( targetClient->GetExchangeID() )
         {
-            psserver->SendSystemError(client->GetClientNum(), "%s is busy with another trade", targetClient->GetName() );
+            psserver->SendSystemError(client->GetClientNum(), "%s is busy with another trade.", targetClient->GetName() );
             return;
         }
 

Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp	2013-04-03 18:22:37 UTC (rev 8666)
+++ trunk/src/server/usermanager.cpp	2013-04-03 18:58:56 UTC (rev 8667)
@@ -2560,7 +2560,7 @@
     //don't allow frozen clients to challenge
     if(client->GetActor()->IsFrozen())
     {
-        psserver->SendSystemInfo(client->GetClientNum(), "You can't challenge opponents while being frozen by a GM");
+        psserver->SendSystemInfo(client->GetClientNum(), "You can't challenge opponents while being frozen.");
         return;
     }
 
@@ -2595,7 +2595,7 @@
 
     if(targetClient->GetActor()->IsFrozen())
     {
-        psserver->SendSystemInfo(client->GetClientNum(), "% was frozen by a GM and cannot be challenged", target->GetName());
+        psserver->SendSystemInfo(client->GetClientNum(), "% was frozen and cannot be challenged", target->GetName());
         return;
     }
 

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