[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp,1.161,1.162 authentserver.cpp,1.136,1.137

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

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

Modified Files:
	adminmanager.cpp authentserver.cpp 
Log Message:
- Fixed the /teleport command crash on map without map
- Made the client re-ask for the message strings if it hasn't received it in 5 sec
- Pushed the net version
- Fixed crash in the weather manager

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** adminmanager.cpp	23 May 2005 22:49:46 -0000	1.161
--- adminmanager.cpp	29 May 2005 19:16:00 -0000	1.162
***************
*** 698,709 ****
      if (msg.target == "map")
      {
!         psserver->SendSystemInfo(subject->GetClientNum(), "Welcome to " + msg.map + ", sector " + csString(targetSector->QueryObject()->GetName()));
      }
      
      if (subject != client)
      {
!         psserver->SendSystemInfo(client->GetClientNum(), "Teleported player " + (csString)subject->GetName() + " to " + msg.target);
          
!         psserver->SendSystemInfo(subject->GetClientNum(), "You were moved by a GM");
      }
      
--- 698,709 ----
      if (msg.target == "map")
      {
!         psserver->SendSystemOK(subject->GetClientNum(), "Welcome to " + msg.map + ", sector " + csString(targetSector->QueryObject()->GetName()));
      }
      
      if (subject != client)
      {
!         psserver->SendSystemResult(client->GetClientNum(), "Teleported player " + (csString)subject->GetName() + " to " + msg.target);
          
!         psserver->SendSystemResult(subject->GetClientNum(), "You were moved by a GM");
      }
      
***************
*** 721,724 ****
--- 721,730 ----
      if (msg.target == "map")
      {
+         if(msg.error)
+         {
+             psserver->SendSystemError(client->GetClientNum(),"You didn't specify a map");
+             return false;
+         }
+ 
          if (msg.useCoords)
          {

Index: authentserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/authentserver.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** authentserver.cpp	19 May 2005 18:57:28 -0000	1.136
--- authentserver.cpp	29 May 2005 19:16:01 -0000	1.137
***************
*** 59,62 ****
--- 59,63 ----
      psserver->msghandler->Subscribe(this,MSGTYPEAUTHCHARACTER,REQUIRE_ANY_CLIENT);
      psserver->msghandler->Subscribe(this,MSGTYPESYSTEM,REQUIRE_ANY_CLIENT); // Handle the heartbeat from the client
+     psserver->msghandler->Subscribe(this,MSGTYPERESENDMSGSTR,REQUIRE_ANY_CLIENT); // Handle the heartbeat from the client
  }
  
***************
*** 70,73 ****
--- 71,75 ----
          psserver->msghandler->Unsubscribe(this,MSGTYPEAUTHCHARACTER);
          psserver->msghandler->Unsubscribe(this,MSGTYPESYSTEM);
+         psserver->msghandler->Unsubscribe(this,MSGTYPERESENDMSGSTR);
      }
  	if (msgstringsmessage)
***************
*** 100,103 ****
--- 102,108 ----
              HandleDisconnect(me, "This is a message coming back from the server. You should normally not be able to see this.");
              break;
+         case MSGTYPERESENDMSGSTR:
+             SendMsgStrings(me->clientnum);
+             break;
      }
  }