diff options
author | Roderic Morris <roderic@ccs.neu.edu> | 2008-07-28 22:03:03 +0000 |
---|---|---|
committer | Roderic Morris <roderic@ccs.neu.edu> | 2008-07-28 22:03:03 +0000 |
commit | 0e0986323c6ae8aed1e9efcf8663c11c0bdecad1 (patch) | |
tree | 436eaa3b0f1f429171436890279f26658b0c2181 /src/chat-server/guild.cpp | |
parent | 30f5a677644fc34fc7e8b3493f7af42056c3285f (diff) | |
download | manaserv-0e0986323c6ae8aed1e9efcf8663c11c0bdecad1.tar.gz manaserv-0e0986323c6ae8aed1e9efcf8663c11c0bdecad1.tar.bz2 manaserv-0e0986323c6ae8aed1e9efcf8663c11c0bdecad1.tar.xz manaserv-0e0986323c6ae8aed1e9efcf8663c11c0bdecad1.zip |
fix crash from last commit, guild fixes, damage calculation fix
Diffstat (limited to 'src/chat-server/guild.cpp')
-rw-r--r-- | src/chat-server/guild.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp index 7320ed7e..74ca17ea 100644 --- a/src/chat-server/guild.cpp +++ b/src/chat-server/guild.cpp @@ -24,17 +24,12 @@ #include <algorithm> -GuildMember::GuildMember(std::string name) : +GuildMember::GuildMember(const std::string &name) : mName(name), mPermissions(0) { } -std::string GuildMember::getName() const -{ - return mName; -} - void GuildMember::setPermission(int perm) { mPermissions = perm; @@ -54,9 +49,10 @@ Guild::~Guild() { } -void Guild::addMember(const std::string &playerName) +void Guild::addMember(const std::string &playerName, int permissions) { GuildMember *member = new GuildMember(playerName); + member->setPermission(permissions); mMembers.push_back(member); if (checkInvited(playerName)) { |