disable native guild support for "new" tmw server.

3 files changed, 20 insertions, 2 deletions

diff --git a/src/commands.cpp b/src/commands.cpp
index ac7b7278d..44449a157 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -114,9 +114,15 @@ static void outString(ChatTab *const tab, const std::string &str,
             if (guild)
             {
                 if (guild->getServerGuild())
+                {
+                    if (tmwServerVersion > 0)
+                        return;
                     Net::getGuildHandler()->chat(guild->getId(), str);
+                }
                 else if (guildManager)
+                {
                     guildManager->chat(str);
+                }
             }
             break;
         }
@@ -212,9 +218,15 @@ static void outStringNormal(ChatTab *const tab,
             if (guild)
             {
                 if (guild->getServerGuild())
+                {
+                    if (tmwServerVersion > 0)
+                        return;
                     Net::getGuildHandler()->chat(guild->getId(), str);
+                }
                 else if (guildManager)
+                {
                     guildManager->chat(str);
+                }
             }
             break;
         }
@@ -402,7 +414,7 @@ impHandler(createParty)
 
 impHandler(createGuild)
 {
-    if (!tab)
+    if (!tab || tmwServerVersion > 0)
         return;
 
     if (args.empty())
@@ -849,7 +861,7 @@ impHandler0(dirs)
 
 impHandler2(info)
 {
-    if (!tab || !player_node)
+    if (!tab || !player_node || !tmwServerVersion > 0)
         return;
 
     switch (tab->getType())
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index ffbbd498c..8b5e1024f 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -1538,6 +1538,9 @@ void SocialWindow::action(const gcn::ActionEvent &event)
     }
     else if (eventId == "create guild")
     {
+        if (tmwServerVersion > 0)
+            return;
+
         std::string name = mGuildCreateDialog->getText();
 
         if (name.size() > 16)
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 73b82bfbc..99416fa73 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -82,6 +82,9 @@ GuildHandler::~GuildHandler()
 void GuildHandler::handleMessage(Net::MessageIn &msg)
 {
     BLOCK_START("GuildHandler::handleMessage")
+    if (tmwServerVersion > 0)
+        return;
+
     switch (msg.getId())
     {
         case SMSG_GUILD_CREATE_RESPONSE: