1 files changed, 16 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 0e871ed91..385af99ad 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -30,6 +30,7 @@
 #include "event.h"
 #include "game.h"
 #include "guild.h"
+#include "guildmanager.h"
 #include "graphicsvertexes.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
@@ -793,6 +794,10 @@ int Client::exec()
             if (mumbleManager)
                 mumbleManager->setServer(mCurrentServer.hostname);
 
+            if (!guildManager)
+                guildManager = new GuildManager();
+            guildManager->init();
+
             if (!mConfigAutoSaved)
             {
                 mConfigAutoSaved = true;
@@ -2180,3 +2185,14 @@ void Client::closeDialogs()
     NpcDialog::closeAll();
     SellDialog::closeAll();
 }
+
+bool Client::isTmw()
+{
+    if (getServerName() == "server.themanaworld.org"
+        || Client::getServerName() == "themanaworld.org"
+        || Client::getServerName() == "81.161.192.4")
+    {
+        return true;
+    }
+    return false;
+}