diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/client.cpp | 2 | ||||
-rw-r--r-- | src/gui/didyouknowwindow.cpp | 2 | ||||
-rw-r--r-- | src/main.h | 4 | ||||
-rw-r--r-- | src/net/generalhandler.h | 2 | ||||
-rw-r--r-- | src/net/manaserv/generalhandler.cpp | 3 | ||||
-rw-r--r-- | src/net/manaserv/generalhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 5 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.h | 2 |
8 files changed, 19 insertions, 3 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/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index 447acfe01..b9f6edbf6 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -75,7 +75,7 @@ DidYouKnowWindow::DidYouKnowWindow(): mBrowserBox->setEnableImages(true); place(0, 0, mScrollArea, 5, 3).setPadding(3); - place(0, 3, mOpenAgainCheckBox); + place(0, 3, mOpenAgainCheckBox, 5); place(1, 4, mButtonPrev, 1); place(2, 4, mButtonNext, 1); place(4, 4, okButton); diff --git a/src/main.h b/src/main.h index b93d363d4..b6c2b858c 100644 --- a/src/main.h +++ b/src/main.h @@ -91,8 +91,8 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.5.29" -#define CHECK_VERSION "01.01.05.29" +#define SMALL_VERSION "1.1.6.12" +#define CHECK_VERSION "01.01.06.12" #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ 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; |