CVS: bzflag/src/bzfs bzfs.cxx,1.85.2.73,1.85.2.74

[Frank T. <ch...@pr...>]

Update of /cvsroot/bzflag/bzflag/src/bzfs
In directory sc8-pr-cvs1:/tmp/cvs-serv13193/src/bzfs

Modified Files:
      Tag: v1_7
	bzfs.cxx 
Log Message:
-tk server option

Index: bzfs.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzfs/bzfs.cxx,v
retrieving revision 1.85.2.73
retrieving revision 1.85.2.74
diff -u -r1.85.2.73 -r1.85.2.74
--- bzfs.cxx	12 Nov 2002 10:01:15 -0000	1.85.2.73
+++ bzfs.cxx	18 Nov 2002 11:19:16 -0000	1.85.2.74
@@ -593,6 +593,8 @@
 static boolean randomCTF;
 // True if -t on cmd line
 static boolean useTeleporters;
+// False if -tk on cmd line
+static boolean teamKillerDies;
 // True if -fb on cmd line
 static boolean flagsOnBuildings;
 // True if -g on cmd line
@@ -4336,8 +4338,9 @@
 #endif
   if (winningTeam != (int)NoTeam)
     checkTeamScore(killerIndex, winningTeam);
-  // kill team killers
-  if ((victimIndex != killerIndex) && (player[victimIndex].team != RogueTeam) &&
+  // kill team killers if not -tk
+  if (teamKillerDies && (victimIndex != killerIndex) &&
+      (player[victimIndex].team != RogueTeam) &&
       (player[victimIndex].team == player[killerIndex].team))
     playerKilled(killerIndex, killerIndex, -1);
 }
@@ -5271,6 +5274,7 @@
 #ifdef TIMELIMIT
 "[-time <seconds>] "
 #endif
+"[-tk] "
 "[-ttl <ttl>] "
 "[-version] "
 "[-world <filename>]";
@@ -5352,6 +5356,7 @@
 #ifdef TIMELIMIT
   cout << "\t -time: set time limit on each game" << endl;
 #endif
+  cout << "\t -tk: player does not die when killing a teammate" << endl;
   cout << "\t -ttl: time-to-live for pings (default=" << pingTTL << ")" << endl;
   cout << "\t -version: print version and exit" << endl;
   cout << "\t -world: world file to load" << endl;
@@ -5471,6 +5476,7 @@
   randomBoxes = False;
   randomHeights = False;
   useTeleporters = False;
+  teamKillerDies = True;
   flagsOnBuildings = False;
   oneGameOnly = False;
   numExtraFlags = 0;
@@ -5628,6 +5634,10 @@
 	usage(argv[0]);
       }
       debug += count;
+    }
+    else if (strcmp(argv[i], "-tk") == 0) {
+      // team killer does not die
+      teamKillerDies = False;
     }
     else if (strcmp(argv[i], "-fb") == 0) {
       // flags on buildings