All pastes #259169 Raw Edit

Miscellany

public text v1 · immutable
#259169 ·published 2006-11-27 04:33 UTC
rendered paste body
Won't cleanly patch.. will have to do it manually.. adds -reporttk option (notifies admins of who TKed who), based on Thumper's patch.


--- bzfs.cxx    2006-11-26 20:07:56.000000000 -0800
+++ bzfs.cxx.patched    2006-11-26 19:00:58.000000000 -0800
@@ -2511,8 +2511,11 @@
   // update tk-score
   if ((victimIndex != killerIndex) && teamkill) {
     killerData->score.tK();
+    char message[MessageLen];
+       if (clOptions->reportTK)
+        snprintf(message, MessageLen, "Team kill: %s killed %s", killerData->player.getCallSign(), victimData->player.getCallSign());
+    sendMessage(ServerPlayer, AdminPlayers, message);
     if (killerData->score.isTK()) {
-      char message[MessageLen];
       strcpy(message, "You have been automatically kicked for team killing" );
       sendMessage(ServerPlayer, killerIndex, message);
       snprintf(message, MessageLen, "Player %s removed: team killing", killerData->player.getCallSign());

--- CmdLineOptions.cxx  2006-11-26 20:09:22.000000000 -0800
+++ CmdLineOptions.cxx.patched  2006-11-26 18:48:45.000000000 -0800
@@ -114,6 +114,7 @@
 "[-replay] "
 "[-reportfile <filename>] "
 "[-reportpipe <filename>] "
+"[-reporttk] "
 "[-requireudp] "
 "[+s <flag-count>] "
 "[-s <flag-count>] "
@@ -211,6 +212,7 @@
 "\t-replay: setup the server to replay a previously saved game\n"
 "\t-reportfile <filename>: the file to store reports in\n"
 "\t-reportpipe <filename>: the program to pipe reports through\n"
+"\t-reporttk: reports team kills to the admin channel\n"
 "\t-requireudp: require clients to use udp\n"
 "\t+s: always have <num> super flags (default=16)\n"
 "\t-s: allow up to <num> super flags (default=16)\n"
@@ -961,6 +963,8 @@
     } else if (strcmp(argv[i], "-reportpipe") == 0) {
       checkArgc(1, i, argc, argv[i]);
       options.reportPipe = argv[i];
+    } else if (strcmp(argv[i], "-reporttk") == 0) {
+      options.reportTK = true;
     } else if (strcmp(argv[i], "-requireudp") == 0) {
       std::cerr << "require UDP clients!" << std::endl;
       options.requireUDP = true;

--- CmdLineOptions.h    2006-11-26 20:10:45.000000000 -0800
+++ CmdLineOptions.h.patched    2006-11-26 18:54:38.000000000 -0800
@@ -70,7 +70,7 @@
     lagwarnthresh(-1.0), jitterwarnthresh(-1.0),
     idlekickthresh(-1.0), timeLimit(0.0f), timeElapsed(0.0f),
     linearAcceleration(_DEFAULT_LIN_ACCEL), angularAcceleration(_DEFAULT_ANGLE_ACCELL), useGivenPort(false),
-    useFallbackPort(false), requireUDP(false), randomBoxes(false),
+    useFallbackPort(false), reportTK(false), requireUDP(false), randomBoxes(false),
     randomCTF(false), flagsOnBuildings(false), respawnOnBuildings(false),
     oneGameOnly(false), timeManualStart(false), randomHeights(false),
     useTeleporters(false), teamKillerDies(true), printScore(false),
@@ -144,6 +144,7 @@
 
   bool                 useGivenPort;
   bool                 useFallbackPort;
+  bool                 reportTK;
   bool                 requireUDP;
   bool                 randomBoxes;
   bool                 randomCTF;