summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-10-07 18:40:24 +0200
committerGitHub <noreply@github.com>2018-10-07 18:40:24 +0200
commitd6c3435b6d6ca032692ceaab5944acd9e8724977 (patch)
treefb5b56909ca62ece98b78d9ea9ad0dcd388e000b
parent71205691cb441e398355944cdad992b6b60053ba (diff)
parent9ac40db6e803d986bf1db3cae000f6c3d5a3b23c (diff)
downloadhercules-d6c3435b6d6ca032692ceaab5944acd9e8724977.tar.gz
hercules-d6c3435b6d6ca032692ceaab5944acd9e8724977.tar.bz2
hercules-d6c3435b6d6ca032692ceaab5944acd9e8724977.tar.xz
hercules-d6c3435b6d6ca032692ceaab5944acd9e8724977.zip
Merge pull request #2235 from dastgirp/issue/2210
Fixed failed assertion in guild invite.
-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
}