diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-06-15 21:26:17 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-06-15 21:26:17 +0000 |
| commit | c934f78758e20244ef669b764e54659bfcd81b9e (patch) | |
| tree | a294fbb3fbc01dbf39e66691e7f5e3059069f724 /src/map/status.c | |
| parent | 6a71384339ee2f4c194dd6afcddd14374dba95ec (diff) | |
| download | hercules-c934f78758e20244ef669b764e54659bfcd81b9e.tar.gz hercules-c934f78758e20244ef669b764e54659bfcd81b9e.tar.bz2 hercules-c934f78758e20244ef669b764e54659bfcd81b9e.tar.xz hercules-c934f78758e20244ef669b764e54659bfcd81b9e.zip | |
* Fixed script command sc_end not supporting the extra argument as stated in script_commands.txt.
* Script command getarg supports an extra argument with a default value that is returned if the requested argument doesn't exist.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10773 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 9b4e2cfd2..75f2cbdfe 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6072,9 +6072,9 @@ int status_change_clear(struct block_list *bl,int type) case SC_JAILED: continue; } - status_change_end(bl, i, -1); + status_change_end(bl, i, INVALID_TIMER); - if (type == 1 && sc->data[i].timer != -1) + if( type == 1 && sc->data[i].timer != INVALID_TIMER ) { //If for some reason status_change_end decides to still keep the status when quitting. [Skotlex] (sc->count)--; delete_timer(sc->data[i].timer, status_change_timer); |