diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/listeners/weightlistener.h | 45 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 15 |
4 files changed, 49 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfc8df4c9..aee55c68b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -968,6 +968,7 @@ SET(SRCS listeners/updatestatuslistener.h utils/sdlpixel.h gui/widgets/widget.h + listeners/weightlistener.h listeners/widgetlistener.h listeners/wrongdatanoticelistener.cpp listeners/wrongdatanoticelistener.h diff --git a/src/Makefile.am b/src/Makefile.am index c882863d1..dc9bac05d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -204,6 +204,7 @@ manaplus_SOURCES += events/actionevent.h \ listeners/updatestatuslistener.h \ utils/sdlpixel.h \ gui/widgets/widget.h \ + listeners/weightlistener.h \ listeners/widgetlistener.h \ listeners/wrongdatanoticelistener.cpp \ listeners/wrongdatanoticelistener.h \ diff --git a/src/listeners/weightlistener.h b/src/listeners/weightlistener.h new file mode 100644 index 000000000..607399401 --- /dev/null +++ b/src/listeners/weightlistener.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_WEIGHTLISTENER_H +#define LISTENERS_WEIGHTLISTENER_H + +#include "gui/windows/okdialog.h" + +#include "listeners/actionlistener.h" + +#include "localconsts.h" + +extern OkDialog *weightNotice; + +/** + * Listener used for handling the overweigth message. + */ +struct WeightListener final : public ActionListener +{ + void action(const ActionEvent &event A_UNUSED) + { + weightNotice = nullptr; + } +}; + +#endif // LISTENERS_WEIGHTLISTENER_H diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index c6080bcee..da38cce6a 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -45,6 +45,7 @@ #include "listeners/updatestatuslistener.h" #include "listeners/playerdeathlistener.h" +#include "listeners/weightlistener.h" #include "net/messagein.h" #include "net/net.h" @@ -53,7 +54,6 @@ #include "debug.h" -extern OkDialog *weightNotice; extern int weightNoticeTime; // Max. distance we are willing to scroll after a teleport; @@ -62,19 +62,8 @@ static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; namespace { - /** - * Listener used for handling the overweigth message. - */ - struct WeightListener final : public ActionListener - { - void action(const ActionEvent &event A_UNUSED) - { - weightNotice = nullptr; - } - } weightListener; - + WeightListener weightListener; PlayerDeathListener deathListener; - } // anonymous namespace namespace Ea |