diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-29 15:27:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-29 15:27:48 +0000 |
| commit | b7158940b46b4a7cc3ad795eb90a0d896936a644 (patch) | |
| tree | b4e7a40356690e2a31994d77f847f62574863dc7 /src/map/status.c | |
| parent | cd4293f57471c8d4a1549d0feb5398fa9bee3720 (diff) | |
| download | hercules-b7158940b46b4a7cc3ad795eb90a0d896936a644.tar.gz hercules-b7158940b46b4a7cc3ad795eb90a0d896936a644.tar.bz2 hercules-b7158940b46b4a7cc3ad795eb90a0d896936a644.tar.xz hercules-b7158940b46b4a7cc3ad795eb90a0d896936a644.zip | |
- Some indentation corrections.
- Ending SC_CLOAK/SC_HIDE/SC_CHASEWALK will now trigger ontouch npcs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7394 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 1654d5dc6..bec04d668 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5688,12 +5688,15 @@ int status_change_end( struct block_list* bl , int type,int tid ) case SC_HIDING: sc->option &= ~OPTION_HIDE; + opt_flag = 2; //Check for warp trigger. break; case SC_CLOAKING: sc->option &= ~OPTION_CLOAK; + opt_flag = 2; break; case SC_CHASEWALK: sc->option &= ~(OPTION_CHASEWALK|OPTION_CLOAK); + opt_flag = 2; break; case SC_SIGHT: sc->option &= ~OPTION_SIGHT; @@ -5781,6 +5784,9 @@ int status_change_end( struct block_list* bl , int type,int tid ) if (calc_flag) status_calc_bl(bl,calc_flag); + if(opt_flag == 2 && sd && map_getcell(bl->m,bl->x,bl->y,CELL_CHKNPC)) + npc_touch_areanpc(sd,bl->m,bl->x,bl->y); //Trigger on-touch event. + return 1; } |