diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-29 21:46:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-29 21:51:03 +0300 |
| commit | dccd82a3a841e741c59a6db423e9ec1fc471baad (patch) | |
| tree | b7d0a662fdecdf4e7327d416119a3cd5fbaa38c0 /src | |
| parent | 9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71 (diff) | |
| download | manaplus-dccd82a3a841e741c59a6db423e9ec1fc471baad.tar.gz manaplus-dccd82a3a841e741c59a6db423e9ec1fc471baad.tar.bz2 manaplus-dccd82a3a841e741c59a6db423e9ec1fc471baad.tar.xz manaplus-dccd82a3a841e741c59a6db423e9ec1fc471baad.zip | |
Fix client detection in online list.
And online list typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/whoisonline.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 5dff3d503..7965221e4 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -282,7 +282,7 @@ void WhoIsOnline::loadList(std::vector<OnlinePlayer*> &list) case PlayerRelation::FRIEND: player->setText("2"); - neutral.push_back(player); + friends.push_back(player); break; case PlayerRelation::DISREGARDED: @@ -409,7 +409,7 @@ void WhoIsOnline::loadWebList() if (!mShowLevel) level = 0; - OnlinePlayer *player = new OnlinePlayer(nick, 0, level, + OnlinePlayer *player = new OnlinePlayer(nick, 255, level, GENDER_UNSPECIFIED, -1); mOnlinePlayers.insert(player); mOnlineNicks.insert(nick); @@ -720,7 +720,7 @@ void OnlinePlayer::setText(std::string color) mText = strprintf("@@%s|##%s%s ", mNick.c_str(), color.c_str(), mNick.c_str()); - if (actorSpriteManager) + if (mStatus != 255 && actorSpriteManager) { Being *being = actorSpriteManager->findBeingByName( mNick, Being::PLAYER); @@ -736,7 +736,7 @@ void OnlinePlayer::setText(std::string color) else if (mGender == GENDER_MALE) mText += "\u2642"; - if (mStatus > 0) + if (mStatus > 0 && mStatus != 255) { if (mStatus & Being::FLAG_SHOP) mText += "$"; diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 621a747b0..8747cf9c4 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -237,7 +237,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg) while (buf - start + 1 < size && *(buf + addVal)) { - unsigned char status = 0; + unsigned char status = 255; unsigned char ver = 0; unsigned char level = 0; if (serverVersion >= 4) |