summaryrefslogtreecommitdiff
path: root/src/guild.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
commit35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch)
tree2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/guild.cpp
parentcfe4c893ba4ba30379919636d3c508ebf1594e23 (diff)
downloadManaVerse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz
ManaVerse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2
ManaVerse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz
ManaVerse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip
some other fixes from cpplint.
Diffstat (limited to 'src/guild.cpp')
-rw-r--r--src/guild.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/guild.cpp b/src/guild.cpp
index 5e6b5cc2e..f02d57354 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -76,7 +76,7 @@ std::string GuildMember::getAdditionString() const
Guild::GuildMap Guild::guilds;
-Guild::Guild(const short id):
+Guild::Guild(const int16_t id):
mMembers(),
mName(),
mId(id),
@@ -253,7 +253,7 @@ Avatar *Guild::getAvatarAt(const int index)
return mMembers[index];
}
-void Guild::setRights(const short rights)
+void Guild::setRights(const int16_t rights)
{
// to invite, rights must be greater than 0
if (rights > 0)
@@ -330,7 +330,7 @@ void Guild::addPos(const int id, const std::string &name)
mPositions[id] = name;
}
-Guild *Guild::getGuild(const short id)
+Guild *Guild::getGuild(const int16_t id)
{
const GuildMap::const_iterator it = guilds.find(id);
if (it != guilds.end())