diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-08-28 16:45:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-08-28 16:45:10 +0300 |
| commit | 6b6fbd4eb1c0122a1c5346f29d54f2aca9b11009 (patch) | |
| tree | 5a8aa4a48c48ea9d2cbace32e45dffa4acdedf3f /src/gui | |
| parent | 69f9daf9fe44bb43bd9112be428438512deca14b (diff) | |
| download | mv-6b6fbd4eb1c0122a1c5346f29d54f2aca9b11009.tar.gz mv-6b6fbd4eb1c0122a1c5346f29d54f2aca9b11009.tar.bz2 mv-6b6fbd4eb1c0122a1c5346f29d54f2aca9b11009.tar.xz mv-6b6fbd4eb1c0122a1c5346f29d54f2aca9b11009.zip | |
Add support for guild invitation in guild bot integration.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/socialwindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index b517911ba..789d98b73 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -23,6 +23,7 @@ #include "actorspritemanager.h" #include "guild.h" +#include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" #include "logger.h" @@ -1310,7 +1311,10 @@ void SocialWindow::action(const gcn::ActionEvent &event) strprintf(_("Accepted guild invite from %s."), mPartyInviter.c_str())); } - Net::getGuildHandler()->inviteResponse(mGuildInvited, true); + if (!guildManager || !guildManager->getEnableGuildBot()) + Net::getGuildHandler()->inviteResponse(mGuildInvited, true); + else + guildManager->inviteResponse(true); } else if (eventId == "no") { @@ -1320,7 +1324,10 @@ void SocialWindow::action(const gcn::ActionEvent &event) strprintf(_("Rejected guild invite from %s."), mPartyInviter.c_str())); } - Net::getGuildHandler()->inviteResponse(mGuildInvited, false); + if (!guildManager || !guildManager->getEnableGuildBot()) + Net::getGuildHandler()->inviteResponse(mGuildInvited, false); + else + guildManager->inviteResponse(false); } mGuildInvited = 0; |