From d9773c380e06c089cfee85f07a81ab9167af2982 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Jun 2015 19:23:57 +0300 Subject: Move processOnlineList from ea namespace into eathena. --- src/net/ea/playerhandler.cpp | 63 -------------------------------------------- src/net/ea/playerhandler.h | 2 -- 2 files changed, 65 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 42084e419..46dee6769 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,23 +22,19 @@ #include "net/ea/playerhandler.h" -#include "configuration.h" #include "game.h" #include "party.h" #include "notifymanager.h" #include "soundmanager.h" #include "units.h" -#include "being/beingflag.h" #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/onlineplayer.h" #include "gui/viewport.h" #include "gui/windows/skilldialog.h" #include "gui/windows/statuswindow.h" -#include "gui/windows/whoisonline.h" #include "resources/notifytypes.h" @@ -473,63 +469,4 @@ void PlayerHandler::processMapMusic(Net::MessageIn &msg) map->setMusicFile(music); } -void PlayerHandler::processOnlineList(Net::MessageIn &msg) -{ - if (!whoIsOnline) - return; - - BLOCK_START("PlayerHandler::processOnlineList") - const int size = msg.readInt16("len") - 4; - std::vector arr; - - if (!size) - { - if (whoIsOnline) - whoIsOnline->loadList(arr); - BLOCK_END("PlayerHandler::processOnlineList") - return; - } - - char *const start = reinterpret_cast(msg.readBytes(size, "nicks")); - if (!start) - { - BLOCK_END("PlayerHandler::processOnlineList") - return; - } - - const char *buf = start; - - int addVal = 3; - - while (buf - start + 1 < size - && *(buf + static_cast(addVal))) - { - unsigned char status = *buf; - buf ++; - unsigned char level = *buf; - buf ++; - unsigned char ver = *buf; - buf ++; - - GenderT gender = Gender::UNSPECIFIED; - if (config.getBoolValue("showgender")) - { - if (status & BeingFlag::GENDER_MALE) - gender = Gender::MALE; - else if (status & BeingFlag::GENDER_OTHER) - gender = Gender::OTHER; - else - gender = Gender::FEMALE; - } - arr.push_back(new OnlinePlayer(static_cast(buf), - status, level, gender, ver)); - buf += strlen(buf) + 1; - } - - if (whoIsOnline) - whoIsOnline->loadList(arr); - delete [] start; - BLOCK_END("PlayerHandler::processOnlineList") -} - } // namespace Ea diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 4f443c8bf..2134db051 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -81,8 +81,6 @@ class PlayerHandler notfinal : public Net::PlayerHandler static void processMapMask(Net::MessageIn &msg); static void processMapMusic(Net::MessageIn &msg); - - static void processOnlineList(Net::MessageIn &msg); }; } // namespace Ea -- cgit v1.2.3-70-g09d2