diff options
author | Haru <haru@dotalux.com> | 2018-07-07 19:59:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-07 19:59:12 +0200 |
commit | f341c57df75c327736792c1b1e98dd68d7033ac9 (patch) | |
tree | 6473aa2be727ada7cca6647cc229e4fce95108a4 /src/char/int_guild.c | |
parent | eed4e9bb3a466cfe32bdb72df12c7ad2ceb0dd79 (diff) | |
parent | b03d9630d877c2ea9e3197e5e22985bac58c82e9 (diff) | |
download | hercules-f341c57df75c327736792c1b1e98dd68d7033ac9.tar.gz hercules-f341c57df75c327736792c1b1e98dd68d7033ac9.tar.bz2 hercules-f341c57df75c327736792c1b1e98dd68d7033ac9.tar.xz hercules-f341c57df75c327736792c1b1e98dd68d7033ac9.zip |
Merge pull request #2124 from MishimaHaruna/guild-add-member-fix
Guild add member fix
Diffstat (limited to 'src/char/int_guild.c')
-rw-r--r-- | src/char/int_guild.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index e7315ed50..e03278fad 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -969,21 +969,24 @@ static struct guild *inter_guild_create(const char *name, const struct guild_mem } // Add member to guild -static bool inter_guild_add_member(int guild_id, const struct guild_member *member) +static bool inter_guild_add_member(int guild_id, const struct guild_member *member, int map_fd) { struct guild * g; int i; nullpo_ret(member); g = inter_guild->fromsql(guild_id); - if (g == NULL) + if (g == NULL) { + mapif->guild_memberadded(map_fd, guild_id, member->account_id, member->char_id, 1); // 1: Failed to add return false; + } // Find an empty slot for (i = 0; i < g->max_member; i++) { if (g->member[i].account_id == 0) { g->member[i] = *member; g->member[i].modified = (GS_MEMBER_NEW | GS_MEMBER_MODIFIED); + mapif->guild_memberadded(map_fd, guild_id, member->account_id, member->char_id, 0); // 0: success if (!inter_guild->calcinfo(g)) //Send members if it was not invoked. mapif->guild_info(-1, g); @@ -993,6 +996,8 @@ static bool inter_guild_add_member(int guild_id, const struct guild_member *memb return true; } } + + mapif->guild_memberadded(map_fd, guild_id, member->account_id, member->char_id, 1); // 1: Failed to add return false; } |