diff options
| author | panikon <panikon@zoho.com> | 2014-04-11 22:22:37 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-04-11 22:22:37 -0300 |
| commit | 6f6a6b3db3b36846f68e6b8ccb59351dced66ab3 (patch) | |
| tree | 090e324567c62292ab98fd1f1e1a970f8a9c82c0 /src/map/clif.c | |
| parent | 6a27692a32abd3a69566626070abed88808d0489 (diff) | |
| download | hercules-6f6a6b3db3b36846f68e6b8ccb59351dced66ab3.tar.gz hercules-6f6a6b3db3b36846f68e6b8ccb59351dced66ab3.tar.bz2 hercules-6f6a6b3db3b36846f68e6b8ccb59351dced66ab3.tar.xz hercules-6f6a6b3db3b36846f68e6b8ccb59351dced66ab3.zip | |
Fixed issue: 7694
http://hercules.ws/board/tracker/issue-7694-guild-notice/
Follow up to 7a5f7db
Follow up to 4147d9f
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 6ca117284..15acfd117 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9237,6 +9237,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { #if PACKETVER >= 20090218 int i; #endif + bool first_time = false; if(sd->bl.prev != NULL) return; @@ -9397,6 +9398,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { if(sd->state.connect_new) { int lv; + first_time = true; sd->state.connect_new = 0; clif->skillinfoblock(sd); clif->hotkeys(sd); @@ -9537,6 +9539,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { clif->weather_check(sd); + // This should be displayed last + if( sd->guild && first_time ) + clif->guild_notice(sd, sd->guild); + // For automatic triggering of NPCs after map loading (so you don't need to walk 1 step first) if (map->getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNPC)) npc->touch_areanpc(sd,sd->bl.m,sd->bl.x,sd->bl.y); @@ -11330,14 +11336,15 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) if( pc_cant_act(sd) && skill_id != RK_REFRESH - && !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN)) - ) { - // SELF skills can be used with the storage open, issue: 8027 - if( sd->state.storage_flag && tmp&INF_SELF_SKILL ) - storage->close(sd); - else - return; - } + && !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN)) + && ( sd->state.storage_flag && !tmp&INF_SELF_SKILL ) // SELF skills can be used with the storage open, issue: 8027 + ) + return; + + // Some self skills need to close the storage to work properly + if( skill_id == AL_TELEPORT && sd->state.storage_flag ) + storage->close(sd); + if( pc_issit(sd) ) return; |