diff options
| author | Haru <haru@dotalux.com> | 2015-01-22 20:20:59 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-01-24 14:37:26 +0100 |
| commit | 3cfc6ddac576e236ccad0497d8e2ed2ae827c2bb (patch) | |
| tree | 3e64ee3c72ba13886d0f9f696c683a2cfa18a2ac /src/map/guild.c | |
| parent | d355711bbb75c08d0326f737432998a95eebaffb (diff) | |
| download | hercules-3cfc6ddac576e236ccad0497d8e2ed2ae827c2bb.tar.gz hercules-3cfc6ddac576e236ccad0497d8e2ed2ae827c2bb.tar.bz2 hercules-3cfc6ddac576e236ccad0497d8e2ed2ae827c2bb.tar.xz hercules-3cfc6ddac576e236ccad0497d8e2ed2ae827c2bb.zip | |
Channels refactoring: guild_*
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index a33efb831..7f116bae1 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1633,10 +1633,13 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id if (g[0] && g[1] && channel->config->ally && ( flag & 1 ) == 0) { if( !(flag & 0x08) ) { - if (channel->config->ally_autojoin) - channel->guild_join(g[0],g[1]); + if (channel->config->ally_autojoin) { + channel->guild_join_alliance(g[0],g[1]); + channel->guild_join_alliance(g[1],g[0]); + } } else { - channel->guild_leave(g[0],g[1]); + channel->guild_leave_alliance(g[0],g[1]); + channel->guild_leave_alliance(g[1],g[0]); } } |