diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-16 14:05:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-16 14:05:24 +0000 |
| commit | 143e5d0790f5b8eb7e79b275ac37188b5bac7362 (patch) | |
| tree | a86ea7bffa81011c521cf195882c478cce9b6940 /src/map/status.c | |
| parent | 24d0d0a5216219169b8da6c1601b4867bcbe9ca6 (diff) | |
| download | hercules-143e5d0790f5b8eb7e79b275ac37188b5bac7362.tar.gz hercules-143e5d0790f5b8eb7e79b275ac37188b5bac7362.tar.bz2 hercules-143e5d0790f5b8eb7e79b275ac37188b5bac7362.tar.xz hercules-143e5d0790f5b8eb7e79b275ac37188b5bac7362.zip | |
- When reinvoking a combo-time, the previous combo time will be terminated.
- Fixed Esma-state not ending after casting it.
- Fixed @hominfo displaying intimacy on a 1/10k scale.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8997 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 2f8517427..246b90817 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4752,13 +4752,13 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_BLIND:
case SC_BLEEDING:
case SC_DPOISON:
- case SC_COMBO: //You aren't supposed to change the combo (and it gets turned off when you trigger it)
case SC_CLOSECONFINE2: //Can't be re-closed in.
case SC_MARIONETTE:
case SC_MARIONETTE2:
case SC_NOCHAT:
case SC_CHANGE: //Otherwise your Hp/Sp would get refilled while still within effect of the last invocation.
return 0;
+ case SC_COMBO:
case SC_DANCING:
case SC_DEVOTION:
case SC_ASPDPOTION0:
|