summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorDastgir <dastgirp@gmail.com>2018-10-02 00:03:45 +0530
committerDastgir <dastgirp@gmail.com>2018-10-02 00:03:45 +0530
commit9ac40db6e803d986bf1db3cae000f6c3d5a3b23c (patch)
tree36e5be971830762346efdf0396f629938313371d /src/map/guild.c
parent852c13305f67948531bd0277eb1922dbd02b1f26 (diff)
downloadhercules-9ac40db6e803d986bf1db3cae000f6c3d5a3b23c.tar.gz
hercules-9ac40db6e803d986bf1db3cae000f6c3d5a3b23c.tar.bz2
hercules-9ac40db6e803d986bf1db3cae000f6c3d5a3b23c.tar.xz
hercules-9ac40db6e803d986bf1db3cae000f6c3d5a3b23c.zip
Fixed failed assertion in guild invite.
When player accepts invite, add them to member structure. Fixes #2210
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 780d21326..757dbb445 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -721,7 +721,6 @@ static int guild_reply_invite(struct map_session_data *sd, int guild_id, int fla
}
else
{// accepted
- struct guild_member m;
struct guild* g;
int i;
@@ -741,8 +740,8 @@ static int guild_reply_invite(struct map_session_data *sd, int guild_id, int fla
return 0;
}
- guild->makemember(&m,sd);
- intif->guild_addmember(guild_id, &m);
+ guild->makemember(&g->member[i], sd);
+ intif->guild_addmember(guild_id, &g->member[i]);
//TODO: send a minimap update to this player
}