diff options
author | shennetsind <ind@henn.et> | 2013-09-09 19:00:01 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-09-09 19:00:01 -0300 |
commit | df1952d3ecaa5708dbe12e6f32137243c6bfdacb (patch) | |
tree | 2f48f194e777d4a6829796aa03cb96d19c5f930d /src/map/clif.c | |
parent | 24ced6fcef1a95a2abd0c60b4fe90cbbc3aea268 (diff) | |
download | hercules-df1952d3ecaa5708dbe12e6f32137243c6bfdacb.tar.gz hercules-df1952d3ecaa5708dbe12e6f32137243c6bfdacb.tar.bz2 hercules-df1952d3ecaa5708dbe12e6f32137243c6bfdacb.tar.xz hercules-df1952d3ecaa5708dbe12e6f32137243c6bfdacb.zip |
Fixed Bug #7694
Implemented official guild notice behavior of re-displaying upon teleport, added conf/battle/guild.conf setting to modify this.
Special Thanks to kyeme, Frost.
http://hercules.ws/board/tracker/issue-7694-guild-notice/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 4ad4f266b..32291e68f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9336,8 +9336,7 @@ void clif_hercules_chsys_mjoin(struct map_session_data *sd) { /// Notification from the client, that it has finished map loading and is about to display player's character (CZ_NOTIFY_ACTORINIT). /// 007d -void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) -{ +void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { if(sd->bl.prev != NULL) return; @@ -9549,6 +9548,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->npc_id) npc_event_dequeue(sd); + + if( sd->guild && ( battle_config.guild_notice_changemap == 2 || ( battle_config.guild_notice_changemap == 1 && sd->state.changemap ) ) ) + clif->guild_notice(sd,sd->guild); } if( sd->state.changemap ) {// restore information that gets lost on map-change |