summaryrefslogtreecommitdiff
path: root/src/net/tmwa/guildhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
commitd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch)
tree5f128768c66436eefd70632f02889607596609d4 /src/net/tmwa/guildhandler.cpp
parentf1e92aca00a4859047e83fab76220767b9a2f814 (diff)
parente93e6beb456d105987da3190c2a80847b6900081 (diff)
downloadmanaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/net/tmwa/guildhandler.cpp')
-rw-r--r--src/net/tmwa/guildhandler.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 640a6fd78..7ea97eb49 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -79,8 +79,6 @@ GuildHandler::~GuildHandler()
void GuildHandler::handleMessage(Net::MessageIn &msg)
{
- DEBUGLOG("guild message");
-
switch (msg.getId())
{
case SMSG_GUILD_CREATE_RESPONSE:
@@ -92,10 +90,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
break;
case SMSG_GUILD_MEMBER_LOGIN:
- {
processGuildMemberLogin(msg);
break;
- }
case SMSG_GUILD_MASTER_OR_MEMBER:
processGuildMasterOrMember(msg);