diff options
| author | shennetsind <ind@henn.et> | 2013-05-31 02:04:24 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-05-31 02:04:24 -0300 |
| commit | adc2e6ea9778e34945722f8f7d89e10cd9a4b972 (patch) | |
| tree | 0178b50b3ef3bdcdd16d45a56d1c8d250c0eb2ea /src/map/npc.c | |
| parent | 68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b (diff) | |
| download | hercules-adc2e6ea9778e34945722f8f7d89e10cd9a4b972.tar.gz hercules-adc2e6ea9778e34945722f8f7d89e10cd9a4b972.tar.bz2 hercules-adc2e6ea9778e34945722f8f7d89e10cd9a4b972.tar.xz hercules-adc2e6ea9778e34945722f8f7d89e10cd9a4b972.zip | |
Fixed Bug #7272
Special Thanks to bgamez23
http://hercules.ws/board/tracker/issue-7272-secure-npctimeout-bug-for-those-npc-who-have-no-dialog-window/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index bff6be30c..cb26bd75c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -270,11 +270,12 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat sd->st->state = END; sd->state.menu_or_input = 0; sd->npc_menu = 0; - + clif->scriptmes(sd, sd->npc_id, " "); /** * This guy's been idle for longer than allowed, close him. **/ clif->scriptclose(sd,sd->npc_id); + clif->scriptclear(sd,sd->npc_id); sd->npc_idle_timer = INVALID_TIMER; } else //Create a new instance of ourselves to continue sd->npc_idle_timer = add_timer(gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0); @@ -289,8 +290,7 @@ int npc_event_dequeue(struct map_session_data* sd) { nullpo_ret(sd); - if(sd->npc_id) - { //Current script is aborted. + if(sd->npc_id) { //Current script is aborted. if(sd->state.using_fake_npc){ clif->clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd); sd->state.using_fake_npc = 0; |