diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-26 12:01:19 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-26 12:01:19 +0000 |
| commit | 476222257ace810a1e69d552c969f36c4687f4d9 (patch) | |
| tree | 4366787ac16e9f9d952b9cc1dee2c4e45d20e9f2 /src/map/status.c | |
| parent | 07dee1fd6c710b78fc826679966dbb6c0c1a8d44 (diff) | |
| download | hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.gz hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.bz2 hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.xz hercules-476222257ace810a1e69d552c969f36c4687f4d9.zip | |
* NPC event code cleanups.
- removed the 'OnMyMobDead' dead code. It's never supported though documented.
- removed the 'feature' that events only trigger when the player is in the OnTouch area IF it's specified.
It's never documented and breaks official scripts.
- some cleanups and bug fixes to OnTouch_.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14173 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 9b3482d83..479e77fd0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6093,12 +6093,15 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val //OPTION case SC_HIDING: sc->option |= OPTION_HIDE; + opt_flag = 2; 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; @@ -6198,7 +6201,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val break; } - if( sd && sd->ontouch.npc_id ) + if( opt_flag&2 && sd && sd->touching_id ) npc_touchnext_areanpc(sd,false); return 1; |