summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStreusel <streusel@gravity.co.kr>2014-10-18 20:35:40 -0700
committerStreusel <streusel@gravity.co.kr>2014-10-18 20:35:40 -0700
commite552575e01f7d9f519d8708222e8191d56776ddd (patch)
tree6597d512fad04714ecce21a087fe72ab39670504 /src
parentda9534fa2cd8b6f19896d0b7423abdfe7e3b4543 (diff)
downloadhercules-e552575e01f7d9f519d8708222e8191d56776ddd.tar.gz
hercules-e552575e01f7d9f519d8708222e8191d56776ddd.tar.bz2
hercules-e552575e01f7d9f519d8708222e8191d56776ddd.tar.xz
hercules-e552575e01f7d9f519d8708222e8191d56776ddd.zip
As per request by Ind
Diffstat (limited to 'src')
-rw-r--r--src/map/guild.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 595711755..1d9cf03a9 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -459,6 +459,8 @@ int guild_recv_info(struct guild *sg) {
struct map_session_data *sd;
bool guild_new = false;
struct hChSysCh *aChSysSave = NULL;
+ short *instance_save = NULL;
+ unsigned short instances_save = 0;
nullpo_ret(sg);
@@ -538,10 +540,16 @@ int guild_recv_info(struct guild *sg) {
before=*g;
if( g->channel )
aChSysSave = g->channel;
+ if( g->instance )
+ instance_save = g->instance;
+ if( g->instances )
+ instances_save = g->instances;
}
memcpy(g,sg,sizeof(struct guild));
g->channel = aChSysSave;
+ g->instance = instance_save;
+ g->instances = instances_save;
if(g->max_member > MAX_GUILD) {
ShowError("guild_recv_info: Received guild with %d members, but MAX_GUILD is only %d. Extra guild-members have been lost!\n", g->max_member, MAX_GUILD);