5 files changed, 9 insertions, 1 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 0e3567520..140ef330e 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -380,7 +380,7 @@ impHandler(guild)
             else if (guildManager)
                 guildManager->invite(args);
 #else
-            guildHandler->invite(guild->getId(), args);
+            guildHandler->invite(args);
 #endif
         }
     }
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 809ddf88a..2fbe58ed2 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -392,12 +392,14 @@ void BuyDialog::close()
         case Nick:
         case Items:
             break;
+#ifdef EATHENA_SUPPORT
         case Market:
             marketHandler->close();
             break;
         case Cash:
             cashShopHandler->close();
             break;
+#endif
         default:
             buySellHandler->close();
             break;
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 853d2a51c..b423767c5 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -2127,6 +2127,7 @@ void ChatWindow::debugMessage(const std::string &msg)
         debugChatTab->chatLog(msg, ChatMsgType::BY_SERVER);
 }
 
+#ifdef EATHENA_SUPPORT
 void ChatWindow::joinRoom(const bool isJoin)
 {
     Tab *const tab = mChatTabs->getTabByIndex(0);
@@ -2137,3 +2138,4 @@ void ChatWindow::joinRoom(const bool isJoin)
         name = _("General");
     tab->setCaption(name);
 }
+#endif
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 479d7db6a..c6f9c0d43 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -209,7 +209,9 @@ class ChatWindow final : public Window,
                             const bool switchTo,
                             const bool join) A_WARN_UNUSED;
 
+#ifdef EATHENA_SUPPORT
         void joinRoom(const bool isJoin);
+#endif
 
         void removeAllWhispers();
 
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index c60056c3e..677b008c1 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -693,7 +693,9 @@ void InputManager::updateConditionMask()
 
     if (!PlayerInfo::isVending())
         mMask |= InputCondition::NOVENDING;
+#ifdef EATHENA_SUPPORT
     if (!PlayerInfo::isInRoom())
+#endif
         mMask |= InputCondition::NOROOM;
 
     if (!settings.awayMode)