diff options
| author | David Athay <ko2fan@gmail.com> | 2008-03-04 10:57:14 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-03-04 10:57:14 +0000 |
| commit | 5d5a572228cf4a8385db52a1624d31e47d93e408 (patch) | |
| tree | 882a5343fe8a80f0854273b925404f5b2e0612ad /src | |
| parent | f094d17f50a8d714bc457e697eff16ca78c746cd (diff) | |
| download | manaserv-5d5a572228cf4a8385db52a1624d31e47d93e408.tar.gz manaserv-5d5a572228cf4a8385db52a1624d31e47d93e408.tar.bz2 manaserv-5d5a572228cf4a8385db52a1624d31e47d93e408.tar.xz manaserv-5d5a572228cf4a8385db52a1624d31e47d93e408.zip | |
Changed Makefile.am so server now builds, added initialising guild manager
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/account-server/main-account.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
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); |