summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 13:15:21 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 13:15:21 +0000
commitcf42cf75d175807a724a267253d53f02d415d1db (patch)
tree21a9cac5283d721a1409f95b6e282040c7d7d219
parent0f979321b66dd31def3ee900a4b135222ac7f2ba (diff)
Config fixes for moving MOTD and RULES vectors into the ServerConfig class
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2403 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/inspircd_io.h1
-rw-r--r--include/typedefs.h1
-rw-r--r--src/inspircd.cpp4
3 files changed, 4 insertions, 2 deletions
diff --git a/include/inspircd_io.h b/include/inspircd_io.h
index d00009da5..e5447ecb3 100644
--- a/include/inspircd_io.h
+++ b/include/inspircd_io.h
@@ -20,6 +20,7 @@
#include <sstream>
#include <string>
#include "inspircd.h"
+#include "globals.h"
// flags for use with log()
diff --git a/include/typedefs.h b/include/typedefs.h
index 1cd48a24a..05cf9e8db 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -8,6 +8,7 @@
#include "ctables.h"
#include "inspircd.h"
#include "modules.h"
+#include "globals.h"
#include "inspircd_config.h"
#include <string>
#ifdef GCC3
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 2321aebf5..23ce90109 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -323,9 +323,9 @@ void ReadConfig(bool bail, userrec* user)
if (!strcmp(dbg,"none"))
Config->LogLevel = NONE;
- readfile(MOTD,Config->motd);
+ readfile(Config->MOTD,Config->motd);
log(DEFAULT,"Reading message of the day...");
- readfile(RULES,Config->rules);
+ readfile(Config->RULES,Config->rules);
log(DEFAULT,"Reading connect classes...");
Classes.clear();
for (int i = 0; i < ConfValueEnum("connect",&Config->config_f); i++)