From a4567f243d7bf2f13ac11a16c4fbb04cf5e2ba11 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 21 Feb 2009 13:27:09 +0000
Subject: [PATCH] (svn r15543) -Change: allow the default debug level of 6 for
 a dedicated server to be overriden by -d (if used after -D).

---
 docs/openttd.6            | 5 ++++-
 src/openttd.cpp           | 1 +
 src/video/dedicated_v.cpp | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/openttd.6 b/docs/openttd.6
index c60dff5e6e..86fbc6a6c7 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -41,7 +41,10 @@ or 1 if omitted
 .It Fl d Ar cat=level[, ...]
 Set debug verbosity for a specific category
 .It Fl D Ar [host][:port]
-Start a dedicated server
+Start a dedicated server. Sets network debug level to 6. If you want to change this, use
+.Fl d
+after
+.Fl D
 .It Fl G Ar seed
 Seed the pseudo random number generator
 .It Fl e
diff --git a/src/openttd.cpp b/src/openttd.cpp
index d2fc2c658c..416dfa47d5 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -439,6 +439,7 @@ int ttd_main(int argc, char *argv[])
 			videodriver = strdup("dedicated");
 			blitter = strdup("null");
 			dedicated = true;
+			SetDebugString("net=6");
 			if (mgo.opt != NULL) {
 				/* Use the existing method for parsing (openttd -n).
 				 * However, we do ignore the #company part. */
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 21ce2bd1d7..7cf9da8970 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -141,8 +141,6 @@ const char *VideoDriver_Dedicated::Start(const char * const *parm)
 	_screen.height = _cur_resolution.height;
 	ScreenSizeChanged();
 
-	SetDebugString("net=6");
-
 #if defined(WINCE)
 	/* WinCE doesn't support console stuff */
 #elif defined(WIN32)