diff options
| -rw-r--r-- | src/gui/onlineplayer.h | 86 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.h | 58 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 1 |
4 files changed, 89 insertions, 57 deletions
diff --git a/src/gui/onlineplayer.h b/src/gui/onlineplayer.h new file mode 100644 index 000000000..5f4a158eb --- /dev/null +++ b/src/gui/onlineplayer.h @@ -0,0 +1,86 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009-2010 Andrei Karas + * 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 GUI_ONLINEPLAYER_H +#define GUI_ONLINEPLAYER_H + +#include <string> + +#include "localconsts.h" + +class OnlinePlayer final +{ + public: + OnlinePlayer(const std::string &nick, const unsigned char status, + const signed char level, const unsigned char gender, + const signed char version) : + mNick(nick), + mText(""), + mStatus(status), + mLevel(level), + mVersion(version), + mGender(gender), + mIsGM(false) + { + } + + A_DELETE_COPY(OnlinePlayer) + + const std::string getNick() const A_WARN_UNUSED + { return mNick; } + + unsigned char getStaus() const A_WARN_UNUSED + { return mStatus; } + + void setIsGM(const bool b) + { mIsGM = b; } + + char getVersion() const A_WARN_UNUSED + { return mVersion; } + + char getLevel() const A_WARN_UNUSED + { return mLevel; } + + const std::string getText() const A_WARN_UNUSED + { return mText; } + + void setText(std::string str); + + void setLevel(const char level) + { mLevel = level; } + + private: + std::string mNick; + + std::string mText; + + unsigned char mStatus; + + signed char mLevel; + + signed char mVersion; + + unsigned char mGender; + + bool mIsGM; +}; + +#endif // GUI_ONLINEPLAYER_H diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 02ce9c6f7..7ae87c470 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -25,6 +25,7 @@ #include "guild.h" #include "party.h" +#include "gui/onlineplayer.h" #include "gui/viewport.h" #include "gui/windows/chatwindow.h" diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 35b36fd7e..6e49308d4 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -34,67 +34,11 @@ class BrowserBox; class Button; +class OnlinePlayer; class ScrollArea; struct SDL_Thread; -class OnlinePlayer final -{ - public: - OnlinePlayer(const std::string &nick, const unsigned char status, - const signed char level, const unsigned char gender, - const signed char version) : - mNick(nick), - mText(""), - mStatus(status), - mLevel(level), - mVersion(version), - mGender(gender), - mIsGM(false) - { - } - - A_DELETE_COPY(OnlinePlayer) - - const std::string getNick() const A_WARN_UNUSED - { return mNick; } - - unsigned char getStaus() const A_WARN_UNUSED - { return mStatus; } - - void setIsGM(const bool b) - { mIsGM = b; } - - char getVersion() const A_WARN_UNUSED - { return mVersion; } - - char getLevel() const A_WARN_UNUSED - { return mLevel; } - - const std::string getText() const A_WARN_UNUSED - { return mText; } - - void setText(std::string str); - - void setLevel(const char level) - { mLevel = level; } - - private: - std::string mNick; - - std::string mText; - - unsigned char mStatus; - - signed char mLevel; - - signed char mVersion; - - unsigned char mGender; - - bool mIsGM; -}; - /** * Update progress window GUI * diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 09d7e2163..c8cee7979 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -37,6 +37,7 @@ #include "gui/windows/whoisonline.h" +#include "gui/onlineplayer.h" #include "gui/viewport.h" #include "resources/map/map.h" |