summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-12 14:42:12 +0300
committerAndrei Karas <akaras@inbox.ru>2011-06-12 14:42:12 +0300
commitaaea79df0b87ec528e02743c4324429b20a413ed (patch)
tree2a18287ee9d27b73ca2f8e53fef9b40b39952557
parent0b7dceed3c208a9551500ee4089a44a39c2f38b8 (diff)
downloadmanaplus-1.1.6.12.tar.gz
manaplus-1.1.6.12.tar.bz2
manaplus-1.1.6.12.tar.xz
manaplus-1.1.6.12.zip
Fix change character.v1.1.6.12
-rw-r--r--src/client.cpp2
-rw-r--r--src/net/generalhandler.h2
-rw-r--r--src/net/manaserv/generalhandler.cpp3
-rw-r--r--src/net/manaserv/generalhandler.h2
-rw-r--r--src/net/tmwa/generalhandler.cpp5
-rw-r--r--src/net/tmwa/generalhandler.h2
6 files changed, 16 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index b87398a0e..02b4dc3af 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1079,6 +1079,8 @@ int Client::exec()
mCurrentDialog = NULL;
logger->log1("State: GAME");
+ if (Net::getGeneralHandler())
+ Net::getGeneralHandler()->reloadPartially();
game = new Game;
break;
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;