[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp,1.267,1.268

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

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

Modified Files:
	adminmanager.cpp 
Log Message:
little fixes for teleport result messages

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.267
retrieving revision 1.268
diff -C2 -d -r1.267 -r1.268
*** adminmanager.cpp	26 Dec 2005 08:09:33 -0000	1.267
--- adminmanager.cpp	27 Dec 2005 02:39:34 -0000	1.268
***************
*** 1023,1031 ****
          return;
  
      // Update ProxList on sector crossing
      if (oldsector != targetSector)
      {
          subject->UpdateProxList(true);
!         psserver->SendSystemOK(subject->GetClientID(), "Welcome to " + msg.map + ", sector " + csString(targetSector->QueryObject()->GetName()));
      }
      else
--- 1023,1037 ----
          return;
  
+     csString destName;
+     if (msg.map.Length())
+         destName = msg.map;
+     else
+         destName.Format("sector %s", targetSector->QueryObject()->GetName() );
+ 
      // Update ProxList on sector crossing
      if (oldsector != targetSector)
      {
          subject->UpdateProxList(true);
!         psserver->SendSystemOK(subject->GetClientID(), "Welcome to " + destName);
      }
      else
***************
*** 1038,1042 ****
      if (subject->GetClientID() != (int)client->GetClientNum())
      {
!         psserver->SendSystemResult(client->GetClientNum(), "Teleported player " + (csString)subject->GetName() + " to " + msg.target);
          psserver->SendSystemResult(subject->GetClientID(), "You were moved by a GM");
      }
--- 1044,1048 ----
      if (subject->GetClientID() != (int)client->GetClientNum())
      {
!         psserver->SendSystemResult(client->GetClientNum(), "Teleported %s to %s", subject->GetName(), ((msg.target=="map")?destName:msg.target).GetData() );
          psserver->SendSystemResult(subject->GetClientID(), "You were moved by a GM");
      }