summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-27 06:03:15 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-27 06:03:15 +0300
commit58ce176510f85a07523690d9cd67df850a8b1f58 (patch)
tree476c2f01a141d35b6c688af9de352d1bef2b6893 /src
parent88487446af6f9e01fe27b63e7710c991b998d4b9 (diff)
downloadmv-58ce176510f85a07523690d9cd67df850a8b1f58.tar.gz
mv-58ce176510f85a07523690d9cd67df850a8b1f58.tar.bz2
mv-58ce176510f85a07523690d9cd67df850a8b1f58.tar.xz
mv-58ce176510f85a07523690d9cd67df850a8b1f58.zip
Put online player at top in guild list.
Diffstat (limited to 'src')
-rw-r--r--src/guild.cpp4
-rw-r--r--src/guildmanager.cpp7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/guild.cpp b/src/guild.cpp
index e36b68863..57b3d52e1 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -36,8 +36,8 @@ class SortGuildFunctor
if (m1->getPos() != m2->getPos())
return m1->getPos() < m2->getPos();
-// if (m1->getOnline() != m2->getOnline())
-// return m1->getOnline() > m2->getOnline();
+ if (m1->getOnline() != m2->getOnline())
+ return m1->getOnline() > m2->getOnline();
return m1->getName() < m2->getName();
}
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index ec9de2506..8f480803a 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -107,7 +107,6 @@ void GuildManager::updateList()
Guild *guild = Guild::getGuild(1);
if (guild)
{
- logger->log("filling player");
guild->setServerGuild(false);
std::vector<std::string>::iterator it = mTempList.begin();
std::vector<std::string>::iterator it_end = mTempList.end();
@@ -172,9 +171,10 @@ bool GuildManager::process(std::string msg)
if (msg[0] == '#' && msg[1] == '#')
msg = msg.substr(3);
- GuildMember *m = guild->getMember(msg);
+ GuildMember *m = guild->addMember(msg);
if (m)
m->setOnline(false);
+ guild->sort();
mRequest = false;
return true;
}
@@ -184,9 +184,10 @@ bool GuildManager::process(std::string msg)
return false;
if (msg[0] == '#' && msg[1] == '#')
msg = msg.substr(3);
- GuildMember *m = guild->getMember(msg);
+ GuildMember *m = guild->addMember(msg);
if (m)
m->setOnline(true);
+ guild->sort();
mRequest = false;
return true;
}