Changed Makefile.am so server now builds, added initialising guild manager

3 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ba18761..b067c374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-04  David Athay <ko2fan@gmail.com>
+
+	* src/Makefile.am: Changed guild from account to chat server.
+	* src/account-server/main-account.cpp: Initialise guild manager
+	after the chat manager.
+
 2008-03-03  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/defines.h, src/game-server/being.cpp,
diff --git a/src/Makefile.am b/src/Makefile.am
index e8638da3..d6b8368d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,10 +19,6 @@ tmwserv_account_SOURCES = \
 	account-server/dalstorage.hpp \
 	account-server/dalstorage.cpp \
 	account-server/dalstoragesql.hpp \
-	account-server/guild.cpp \
-	account-server/guild.h \
-	account-server/guildmanager.cpp \
-	account-server/guildmanager.h \
 	account-server/serverhandler.hpp \
 	account-server/serverhandler.cpp \
 	chat-server/chathandler.hpp \
@@ -32,6 +28,10 @@ tmwserv_account_SOURCES = \
 	chat-server/chatchannel.cpp \
 	chat-server/chatchannelmanager.hpp \
 	chat-server/chatchannelmanager.cpp \
+	chat-server/guild.hpp \
+	chat-server/guild.cpp \
+	chat-server/guildmanager.hpp \
+	chat-server/guildmanager.cpp \
 	common/configuration.hpp \
 	common/configuration.cpp \
 	common/inventorydata.hpp \
diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 6c0fb3a0..9fb78870 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -149,6 +149,8 @@ static void initialize()
     stringFilter = new StringFilter;
     // Initialize the Chat channels manager
     chatChannelManager = new ChatChannelManager;
+    // Initialise the Guild manager
+    guildManager = new GuildManager;
 
     // --- Initialize the global handlers
     // FIXME: Make the global handlers global vars or part of a bigger
@@ -288,7 +290,7 @@ int main(int argc, char *argv[])
 #ifdef PACKAGE_VERSION
     LOG_INFO("The Mana World Account+Chat Server v" << PACKAGE_VERSION);
 #endif
-    
+
     // Parse Command Line Options
     parseOptions(argc, argv);