summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-02 18:58:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-02 18:58:51 +0300
commit691703127f7f35e8b954782ddb7ff613c478bedb (patch)
tree5599818e8e26138fbcbec82823eab751253acc93
parentc73d1eddfd143dfbd78f078487601d650c931752 (diff)
downloadmv-691703127f7f35e8b954782ddb7ff613c478bedb.tar.gz
mv-691703127f7f35e8b954782ddb7ff613c478bedb.tar.bz2
mv-691703127f7f35e8b954782ddb7ff613c478bedb.tar.xz
mv-691703127f7f35e8b954782ddb7ff613c478bedb.zip
Collect asserts before creating chat window
and after show all collected asserts in debug chat tab.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/client.cpp5
-rw-r--r--src/game.cpp8
-rw-r--r--src/listeners/assertlistener.cpp41
-rw-r--r--src/listeners/assertlistener.h47
6 files changed, 105 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 310fca0df..02375d26b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -902,6 +902,8 @@ SET(SRCS
listeners/actorspritelistener.h
listeners/arrowslistener.cpp
listeners/arrowslistener.h
+ listeners/assertlistener.cpp
+ listeners/assertlistener.h
listeners/attributelistener.cpp
listeners/attributelistener.h
listeners/awaylistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 416a93cc8..b6aed9ae1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -902,6 +902,8 @@ manaplus_SOURCES += main.cpp \
listeners/actorspritelistener.h \
listeners/arrowslistener.cpp \
listeners/arrowslistener.h \
+ listeners/assertlistener.cpp \
+ listeners/assertlistener.h \
listeners/awaylistener.cpp \
listeners/awaylistener.h \
listeners/charrenamelistener.cpp \
diff --git a/src/client.cpp b/src/client.cpp
index 075c6335e..4f7accd36 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -143,6 +143,7 @@
#include "utils/translation/translationmanager.h"
+#include "listeners/assertlistener.h"
#include "listeners/errorlistener.h"
#ifdef USE_OPENGL
@@ -261,6 +262,7 @@ void Client::gameInit()
initRand();
+ assertListener = new AssertListener;
// Load branding information
if (!settings.options.brandingPath.empty())
branding.init(settings.options.brandingPath);
@@ -573,6 +575,8 @@ void Client::gameClear()
logger->log1("Quitting1");
config.removeListeners(this);
+ delete2(assertListener);
+
eventsManager.shutdown();
WindowManager::deleteWindows();
if (windowContainer)
@@ -983,6 +987,7 @@ int Client::gameExec()
if (mOldState == State::GAME)
{
delete2(mGame);
+ assertListener = new AssertListener;
Game::clearInstance();
resourceManager->cleanOrphans();
Party::clearParties();
diff --git a/src/game.cpp b/src/game.cpp
index 5af1a8a67..9906b8cf1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -131,6 +131,7 @@
#include "utils/naclmessages.h"
#endif // __native_client__
+#include "listeners/assertlistener.h"
#include "listeners/errorlistener.h"
#ifdef TMWA_SUPPORT
@@ -275,6 +276,13 @@ static void createGuiWindows()
"#Debug", ChatTabType::DEBUG);
debugChatTab->setAllowHighlight(false);
+ if (assertListener)
+ {
+ const StringVect &messages = assertListener->getMessages();
+ FOR_EACH (StringVectCIter, it, messages)
+ debugChatTab->chatLog(*it, ChatMsgType::BY_SERVER);
+ delete2(assertListener);
+ }
if (config.getBoolValue("enableTradeTab"))
chatWindow->addSpecialChannelTab(TRADE_CHANNEL, false);
else
diff --git a/src/listeners/assertlistener.cpp b/src/listeners/assertlistener.cpp
new file mode 100644
index 000000000..f7bb4afcc
--- /dev/null
+++ b/src/listeners/assertlistener.cpp
@@ -0,0 +1,41 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2016 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "listeners/assertlistener.h"
+
+#include "debug.h"
+
+AssertListener *assertListener = nullptr;
+
+AssertListener::AssertListener() :
+ DebugMessageListener(),
+ mMessages()
+{
+}
+
+void AssertListener::debugMessage(const std::string &msg)
+{
+ mMessages.push_back(msg);
+}
+
+const StringVect &AssertListener::getMessages() const
+{
+ return mMessages;
+}
diff --git a/src/listeners/assertlistener.h b/src/listeners/assertlistener.h
new file mode 100644
index 000000000..36e30c6a3
--- /dev/null
+++ b/src/listeners/assertlistener.h
@@ -0,0 +1,47 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2016 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LISTENERS_ASSERTLISTENER_H
+#define LISTENERS_ASSERTLISTENER_H
+
+#include "listeners/debugmessagelistener.h"
+
+#include "utils/stringvector.h"
+
+#include "localconsts.h"
+
+class AssertListener final : public DebugMessageListener
+{
+ public:
+ AssertListener();
+
+ A_DELETE_COPY(AssertListener)
+
+ void debugMessage(const std::string &msg) override final;
+
+ const StringVect &getMessages() const;
+
+ private:
+ StringVect mMessages;
+};
+
+extern AssertListener *assertListener;
+
+#endif // LISTENERS_ASSERTLISTENER_H