SF.net SVN: bzflag:[18673] trunk/bzflag/src/bzfs

[<bul...@us...>]

Revision: 18673
          http://bzflag.svn.sourceforge.net/bzflag/?rev=18673&view=rev
Author:   bullet_catcher
Date:     2008-09-30 15:15:14 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Provide explanatory messages to the players when the server is deliberately shut down.

Modified Paths:
--------------
    trunk/bzflag/src/bzfs/bzfs.cxx
    trunk/bzflag/src/bzfs/commands.cxx

Modified: trunk/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfs.cxx	2008-09-30 14:34:21 UTC (rev 18672)
+++ trunk/bzflag/src/bzfs/bzfs.cxx	2008-09-30 15:15:14 UTC (rev 18673)
@@ -2552,8 +2552,11 @@
     sendScoreOverMessage(playerIndex, (TeamColor)teamIndex);
 
     gameOver = true;
-    if (clOptions->oneGameOnly)
+    if (clOptions->oneGameOnly) {
+      sendMessage(ServerPlayer, AllPlayers,
+		  "automatically shutting down now that the game is over");
       done = true;
+    }
   }
 }
 
@@ -2622,8 +2625,11 @@
     sendScoreOverMessage(killer->getIndex(), NoTeam);
 
     gameOver = true;
-    if (clOptions->oneGameOnly)
+    if (clOptions->oneGameOnly) {
+      sendMessage(ServerPlayer, AllPlayers,
+		  "automatically shutting down now that the game is over");
       done = true;
+    }
   }
 }
 
@@ -3227,6 +3233,7 @@
 {
   bzSignal(SIGINT, SIG_PF(terminateServer));
   bzSignal(SIGTERM, SIG_PF(terminateServer));
+  sendMessage(ServerPlayer, AllPlayers, "shutting down now");
   done = true;
 }
 
@@ -4151,8 +4158,11 @@
 
       sendMsgTimeUpdate((int)timeLeft);
       clOptions->timeElapsed = newTimeElapsed;
-      if (clOptions->oneGameOnly && timeLeft == 0.0f)
+      if (clOptions->oneGameOnly && timeLeft == 0.0f) {
+	sendMessage(ServerPlayer, AllPlayers,
+		    "automatically shutting down now that the game is over");
 	done = true;
+      }
     }
   }
 }

Modified: trunk/bzflag/src/bzfs/commands.cxx
===================================================================
--- trunk/bzflag/src/bzfs/commands.cxx	2008-09-30 14:34:21 UTC (rev 18672)
+++ trunk/bzflag/src/bzfs/commands.cxx	2008-09-30 15:15:14 UTC (rev 18673)
@@ -1045,6 +1045,7 @@
 bool ShutdownCommand::operator() (const char *,
 				  GameKeeper::Player *playerData)
 {
+  std::string explanation;
   // If no playerData - dont perfom permission check, since it is probably the API
   if (playerData){
     int t = playerData->getIndex();
@@ -1052,7 +1053,12 @@
       sendMessage(ServerPlayer, t, "You do not have permission to run the shutdown command");
       return true;
     }
+    explanation = TextUtils::format("shut down by %s",
+				    playerData->player.getCallSign());
+  } else {
+    explanation = "shut down";
   }
+  sendMessage(ServerPlayer, AllPlayers, explanation.c_str());
   done = true;
   return true;
 }


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