CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <[EMAIL PROTECTED]> 05/09/18 20:13:17
Modified files:
doc/man : wesnothd.6
src/server : server.cpp
Log message:
fix -v clash in server
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/doc/man/wesnothd.6.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
Patches:
Index: wesnoth/doc/man/wesnothd.6
diff -u wesnoth/doc/man/wesnothd.6:1.10 wesnoth/doc/man/wesnothd.6:1.11
--- wesnoth/doc/man/wesnothd.6:1.10 Sun Sep 18 19:16:53 2005
+++ wesnoth/doc/man/wesnothd.6 Sun Sep 18 20:13:16 2005
@@ -13,7 +13,7 @@
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.\"
-.TH WESNOTHD 6 "June 2005" "wesnothd" "Battle for Wesnoth multiplayer network
daemon"
+.TH WESNOTHD 6 "2005" "wesnothd" "Battle for Wesnoth multiplayer network
daemon"
.SH NAME
Battle for Wesnoth multiplayer network daemon
@@ -51,11 +51,15 @@
.TP
.BR -t , \ --thread n
-sets the number of worker threads for network I/O to n. (default: 5)
+sets the number of worker threads for network I/O to n (default: 5).
.TP
-.BR -v , \ --version
+.BR -V , \ --version
shows version number and exits.
+
+.TP
+.BR -v , \ --verbose
+turns on more verbose logging.
.SH AUTHOR
Written by David White <[EMAIL PROTECTED]>.
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.89 wesnoth/src/server/server.cpp:1.90
--- wesnoth/src/server/server.cpp:1.89 Sun Sep 18 19:08:31 2005
+++ wesnoth/src/server/server.cpp Sun Sep 18 20:13:16 2005
@@ -1,4 +1,4 @@
-/* $Id: server.cpp,v 1.89 2005/09/18 19:08:31 ott Exp $ */
+/* $Id: server.cpp,v 1.90 2005/09/18 20:13:16 ott Exp $ */
/*
Copyright (C) 2003-5 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1036,10 +1036,10 @@
<< " -d --daemon Runs wesnothd
as a daemon\n"
<< " -m, --max_packet_size n Sets the
maximal packet size to n\n"
<< " -p, --port Binds the
server to the specified port\n"
- << " -v, --version Returns the
server version\n"
+ << " -V, --version Returns the
server version\n"
<< " -t, --threads n Uses n worker
threads for network I/O (default: 5)\n";
return 0;
- } else if(val == "--version" || val == "-v") {
+ } else if(val == "--version" || val == "-V") {
std::cout << "Battle for Wesnoth server " <<
game_config::version
<< "\n";
return 0;
