Merge remote-tracking branch 'upstream/master'

5 files changed, 14 insertions, 0 deletions

diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index f24b6db7f..4d68faffc 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -44,6 +44,8 @@ class GeneralHandler
         virtual void flushNetwork() = 0;
 
         virtual void clearHandlers() = 0;
+        virtual void reloadPartially() = 0;
+
 };
 
 } // namespace Net
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 6957d4cb4..7c95033a8 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -209,4 +209,7 @@ void GeneralHandler::event(Mana::Channels channel,
     }
 }
 
+void GeneralHandler::reloadPartially()
+{
+}
 } // namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 946f7d631..17e45947a 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -48,6 +48,8 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener
 
         void reload();
 
+        void reloadPartially();
+
         void unload();
 
         void flushNetwork();
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9ee8e7a23..c6d98c60b 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -203,6 +203,11 @@ void GeneralHandler::reload()
     static_cast<PartyHandler*>(mPartyHandler.get())->reload();
 }
 
+void GeneralHandler::reloadPartially()
+{
+    static_cast<PartyHandler*>(mPartyHandler.get())->reload();
+}
+
 void GeneralHandler::unload()
 {
     if (mNetwork)
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 516db76c5..bccde03cb 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -61,6 +61,8 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
 
         void event(Mana::Channels channel, const Mana::Event &event);
 
+        void reloadPartially();
+
     protected:
         MessageHandlerPtr mAdminHandler;
         MessageHandlerPtr mBeingHandler;