aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorclick <none@none>2010-07-29 01:22:45 +0200
committerclick <none@none>2010-07-29 01:22:45 +0200
commit3296a944e787213ad2fb1cdc61212311424c4952 (patch)
tree7a8694cad305bbc06d9f634a15226fae031c5cfc /src/server/worldserver
parent22d75dabdaeb19e849d05c8e5277d92589a77978 (diff)
Convert to using ACE for reading configurationfiles, and remove dependency on dotconfpp configuration library and related files
(patch by astellar - and a thankyou to vladimir for being a russian teddybear) --HG-- branch : trunk
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/CommandLine/CliRunnable.cpp2
-rw-r--r--src/server/worldserver/Main.cpp2
-rw-r--r--src/server/worldserver/Master.cpp2
-rw-r--r--src/server/worldserver/RemoteAccess/RASocket.cpp2
-rw-r--r--src/server/worldserver/worldserver.conf.dist2
5 files changed, 6 insertions, 4 deletions
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index 294c512759f..536fd9bf883 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -26,7 +26,7 @@
#include "ObjectMgr.h"
#include "World.h"
#include "WorldSession.h"
-#include "Configuration/ConfigEnv.h"
+#include "Configuration/Config.h"
#include "AccountMgr.h"
#include "Chat.h"
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 5166ca741df..3e3310c613a 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -28,7 +28,7 @@
#include "Common.h"
#include "Database/DatabaseEnv.h"
-#include "Configuration/ConfigEnv.h"
+#include "Configuration/Config.h"
#include "Log.h"
#include "Master.h"
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 4a986893d78..fd2e7217daa 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -31,7 +31,7 @@
#include "WorldRunnable.h"
#include "WorldSocket.h"
#include "WorldSocketMgr.h"
-#include "Configuration/ConfigEnv.h"
+#include "Configuration/Config.h"
#include "Database/DatabaseEnv.h"
#include "CliRunnable.h"
diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index 98587c935d0..69601155b37 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
@@ -23,7 +23,7 @@
*/
#include "Common.h"
-#include "Configuration/ConfigEnv.h"
+#include "Configuration/Config.h"
#include "Database/DatabaseEnv.h"
#include "AccountMgr.h"
#include "Log.h"
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 4847b22a737..768ed66620c 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -1,6 +1,8 @@
################################################
# Trinity Core World Server configuration file #
################################################
+[worldserver]
+
# Note to devs, line breaks should be at column 80
###############################################################################
# CONNECTIONS AND DIRECTORIES