diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
| commit | 7a20f13a210f395b8276cb19583e0b302f4f6a1f (patch) | |
| tree | 4a0dd554aa88f68f97f5d9f9676d23d1cfc9da15 /src/map/clif.c | |
| parent | 7626b141f8e56b1739abce76f5a99cbbb2b4b159 (diff) | |
| parent | 24d6aba263ff25724b8e6c9d6a228bba9fd6e756 (diff) | |
| download | hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.gz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.bz2 hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.xz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index f8b5119eb..e04941336 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9358,6 +9358,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) } map_iwall_get(sd); // Updates Walls Info on this Map to Client + status_calc_pc(sd, false);/* some conditions are map-dependent so we must recalculate */ sd->state.changemap = false; } @@ -11112,13 +11113,13 @@ void clif_parse_NpcSelectMenu(int fd,struct map_session_data *sd) uint8 select = RFIFOB(fd,6); if( (select > sd->npc_menu && select != 0xff) || select == 0 ) { -#ifdef SECURE_NPCTIMEOUT +#if SECURE_NPCTIMEOUT if( sd->npc_idle_timer != INVALID_TIMER ) { #endif TBL_NPC* nd = map_id2nd(npc_id); ShowWarning("Invalid menu selection on npc %d:'%s' - got %d, valid range is [%d..%d] (player AID:%d, CID:%d, name:'%s')!\n", npc_id, (nd)?nd->name:"invalid npc id", select, 1, sd->npc_menu, sd->bl.id, sd->status.char_id, sd->status.name); clif_GM_kick(NULL,sd); -#ifdef SECURE_NPCTIMEOUT +#if SECURE_NPCTIMEOUT } #endif return; |