diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-22 15:36:41 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-22 15:36:41 +0000 |
| commit | a4238c21464e3bf61150795d49f9478293cae586 (patch) | |
| tree | 6a57b1b11073ef6175de38fb37a3c1d334366e56 /src/map/status.c | |
| parent | 4b9b06cc7dad8a7dd9ba729fbed753b7acd49367 (diff) | |
| download | hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.gz hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.bz2 hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.xz hercules-a4238c21464e3bf61150795d49f9478293cae586.zip | |
NPC_STOP now stops both sides and will be canceled if either side teleports or dies.(bugreport:3099)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13803 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 7fe6b2326..7839330e4 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6553,6 +6553,15 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid) // from here it's not neccesary to continue return 1; break; + case SC_STOP: + if( sce->val2 ) + { + struct block_list* tbl = map_id2bl(sce->val2); + sce->val2 = 0; + if( tbl && (sc = status_get_sc(tbl)) && sc->data[SC_STOP] && sc->data[SC_STOP]->val2 == bl->id ) + status_change_end(tbl, SC_STOP, -1); + } + break; } opt_flag = 1; |