Menu
▾
▴
SF.net SVN: bzflag: [15601] trunk/bzflag
|
From: <t-...@us...> - 2007-08-31 22:36:50
|
Revision: 15601
http://bzflag.svn.sourceforge.net/bzflag/?rev=15601&view=rev
Author: t-s
Date: 2007-08-31 15:36:46 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Some whitespace and sorting
Modified Paths:
--------------
trunk/bzflag/man/bzfs.6.in
trunk/bzflag/src/bzfs/CmdLineOptions.cxx
trunk/bzflag/src/bzfs/CmdLineOptions.h
Modified: trunk/bzflag/man/bzfs.6.in
===================================================================
--- trunk/bzflag/man/bzfs.6.in 2007-08-31 20:51:12 UTC (rev 15600)
+++ trunk/bzflag/man/bzfs.6.in 2007-08-31 22:36:46 UTC (rev 15601)
@@ -259,6 +259,12 @@
.B \-j
Allows jumping.
.TP
+\fB\-jitterdrop \fIwarn\-count\fR
+Kicks players after \fIwarn\-count\fR jitter warnings.
+.TP
+\fB\-jitterwarn \fImilliseconds\fR
+Send warnings to players that jitter more than \fImilliseconds\fR.
+.TP
\fB\-lagdrop \fIwarn\-count\fR
Kicks players after \fIwarn\-count\fR lag warnings.
.TP
@@ -271,12 +277,6 @@
automaticly. Some plugins take a paramater after the plugin name
it will be specified after a , after the name, i.e. -loadpluing myplugin,myoptions.
.TP
-\fB\-jitterdrop \fIwarn\-count\fR
-Kicks players after \fIwarn\-count\fR jitter warnings.
-.TP
-\fB\-jitterwarn \fImilliseconds\fR
-Send warnings to players that jitter more than \fImilliseconds\fR.
-.TP
\fB\-masterBanURL \fIURL\fR
Specify alternate URLs for the master ban file to be pulled from.
This argument may be provided multiple times.
@@ -866,6 +866,24 @@
List all of the host patterns currently banned from this server.
.TP
+.B /jitterwarn [\fItime\fR]
+Change the maximum allowed jitter time. Example:
+.ft CW
+.nf
+.ne 2
+/jitterwarn 50
+.ft R
+
+.TP
+.B /jitterdrop [\fIcount\fR]
+Change the number of jitter warnings given before a player is kicked. Example:
+.ft CW
+.nf
+.ne 2
+/jitterdrop 3
+.ft R
+
+.TP
.B /kick {\fI"Player Name"\fR|\fIplayerName\fR|\fI#slot\fR} \fIreason\fR
Kick a player off the server. Example:
.ft CW
@@ -912,31 +930,31 @@
/lagdrop 3
.ft R
+.TP
+.B /mute {\fI#slot\fR|\fIcallsign\fR}
+Allows a server admin to remove the ability for a player to communicate with
+other players. Once muted the player may only talk to admins on the server.
+This command removes the TALK permission that is enabled by default for all
+players. (disabling TALK by default would let you run a "silent" server)
+
.TP
-.B /jitterwarn [\fItime\fR]
-Change the maximum allowed jitter time. Example:
+.B /packetlosswarn [\fItime\fR]
+Change the maximum allowed packetloss. Example:
.ft CW
.nf
.ne 2
-/jitterwarn 50
+/packetloss 1
.ft R
.TP
-.B /jitterdrop [\fIcount\fR]
-Change the number of jitter warnings given before a player is kicked. Example:
+.B /packetlossdrop [\fIcount\fR]
+Change the number of packetloss warnings given before a player is kicked. Example:
.ft CW
.nf
.ne 2
-/jitterdrop 3
+/packetloss 3
.ft R
-.TP
-.B /mute {\fI#slot\fR|\fIcallsign\fR}
-Allows a server admin to remove the ability for a player to communicate with
-other players. Once muted the player may only talk to admins on the server.
-This command removes the TALK permission that is enabled by default for all
-players. (disabling TALK by default would let you run a "silent" server)
-
.TP
.B /playerlist
List player names and IP addresses. Example:
Modified: trunk/bzflag/src/bzfs/CmdLineOptions.cxx
===================================================================
--- trunk/bzflag/src/bzfs/CmdLineOptions.cxx 2007-08-31 20:51:12 UTC (rev 15600)
+++ trunk/bzflag/src/bzfs/CmdLineOptions.cxx 2007-08-31 22:36:46 UTC (rev 15601)
@@ -82,12 +82,10 @@
"[-helpmsg <file> <name>] "
"[-i interface] "
"[-j] "
+"[-jitterdrop <num>] "
+"[-jitterwarn <time/ms>] "
"[-lagdrop <num>] "
"[-lagwarn <time/ms>] "
-"[-jitterdrop <num>] "
-"[-jitterwarn <time/ms>] "
-"[-packetlossdrop <num>] "
-"[-packetlosswarn <%>] "
"[-loadplugin <pluginname,commandline>] "
"[-masterBanURL <URL>]"
"[-maxidle <time/s>] "
@@ -99,6 +97,8 @@
"[-noradar]"
"[-offa] "
"[-p <port>] "
+"[-packetlossdrop <num>] "
+"[-packetlosswarn <%>] "
"[-passwd <password>] "
"[-pidfile <filename>] "
"[-poll <variable>=<value>] "
@@ -187,8 +187,6 @@
"\t-lagwarn: lag warning threshhold time [ms]\n"
"\t-jitterdrop: drop player after this many jitter warnings\n"
"\t-jitterwarn: jitter warning threshhold time [ms]\n"
-"\t-packetlossdrop: drop player after this many packetloss warnings\n"
-"\t-packetlosswarn: packetloss warning threshold [%]\n"
"\t-loadplugin: load the specified plugin with the specified commandline\n"
"\t\tstring\n"
"\t-masterBanURL: URL to atempt to get the master ban list from <URL>\n"
@@ -201,6 +199,8 @@
"\t-noradar: disallow the use of radar\n"
"\t-offa: teamless free-for-all game stye\n"
"\t-p: use alternative port (default=5154)\n"
+"\t-packetlossdrop: drop player after this many packetloss warnings\n"
+"\t-packetlosswarn: packetloss warning threshold [%]\n"
"\t-passwd: specify a <password> for operator commands\n"
"\t-pidfile: write the process id into <filename> on startup\n"
"\t-poll: configure several aspects of the in-game polling system\n"
@@ -750,24 +750,18 @@
} else if (strcmp(argv[i], "-handicap") == 0) {
// allow handicap advantage
options.gameOptions |= int(HandicapGameStyle);
+ } else if (strcmp(argv[i], "-jitterdrop") == 0) {
+ checkArgc(1, i, argc, argv[i]);
+ options.maxjitterwarn = atoi(argv[i]);
+ } else if (strcmp(argv[i], "-jitterwarn") == 0) {
+ checkArgc(1, i, argc, argv[i]);
+ options.jitterwarnthresh = atoi(argv[i])/1000.0f;
} else if (strcmp(argv[i], "-lagdrop") == 0) {
checkArgc(1, i, argc, argv[i]);
options.maxlagwarn = atoi(argv[i]);
} else if (strcmp(argv[i], "-lagwarn") == 0) {
checkArgc(1, i, argc, argv[i]);
options.lagwarnthresh = atoi(argv[i])/1000.0f;
- } else if (strcmp(argv[i], "-jitterdrop") == 0) {
- checkArgc(1, i, argc, argv[i]);
- options.maxjitterwarn = atoi(argv[i]);
- } else if (strcmp(argv[i], "-jitterwarn") == 0) {
- checkArgc(1, i, argc, argv[i]);
- options.jitterwarnthresh = atoi(argv[i])/1000.0f;
- } else if (strcmp(argv[i], "-packetlossdrop") == 0) {
- checkArgc(1, i, argc, argv[i]);
- options.maxpacketlosswarn = atoi(argv[i]);
- } else if (strcmp(argv[i], "-packetlosswarn") == 0) {
- checkArgc(1, i, argc, argv[i]);
- options.packetlosswarnthresh = atoi(argv[i])/1000.0f;
} else if (strcmp(argv[i], "-loadplugin") == 0) {
checkArgc(1, i, argc, argv[i]);
std::vector<std::string> a = TextUtils::tokenize(argv[i],std::string(","), 2);
@@ -846,6 +840,12 @@
options.wksPort = ServerPort;
else
options.useGivenPort = true;
+ } else if (strcmp(argv[i], "-packetlossdrop") == 0) {
+ checkArgc(1, i, argc, argv[i]);
+ options.maxpacketlosswarn = atoi(argv[i]);
+ } else if (strcmp(argv[i], "-packetlosswarn") == 0) {
+ checkArgc(1, i, argc, argv[i]);
+ options.packetlosswarnthresh = atoi(argv[i])/1000.0f;
} else if (strcmp(argv[i], "-passwd") == 0 || strcmp(argv[i], "-password") == 0) {
checkFromWorldFile(argv[i], fromWorldFile);
checkArgc(1, i, argc, argv[i]);
Modified: trunk/bzflag/src/bzfs/CmdLineOptions.h
===================================================================
--- trunk/bzflag/src/bzfs/CmdLineOptions.h 2007-08-31 20:51:12 UTC (rev 15600)
+++ trunk/bzflag/src/bzfs/CmdLineOptions.h 2007-08-31 22:36:46 UTC (rev 15601)
@@ -133,14 +133,14 @@
uint16_t shakeTimeout;
int teamFlagTimeout;
int maxlagwarn;
- int maxjitterwarn;
- int maxpacketlosswarn;
- int processorAffinity;
+ int maxjitterwarn;
+ int maxpacketlosswarn;
+ int processorAffinity;
float lagwarnthresh;
- float jitterwarnthresh;
- float packetlosswarnthresh;
+ float jitterwarnthresh;
+ float packetlosswarnthresh;
float idlekickthresh;
float timeLimit;
float timeElapsed;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|