diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 02:38:47 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 02:38:47 +0000 |
| commit | 3455651a40c54646a4819e4c20ed39b947a1db80 (patch) | |
| tree | 4829a30446df60a7ddafcdb494fc32c669a6d8e4 /src/map/status.c | |
| parent | 81289b916f65036bcab0c292d433ee2a2e9aa8c6 (diff) | |
| download | hercules-3455651a40c54646a4819e4c20ed39b947a1db80.tar.gz hercules-3455651a40c54646a4819e4c20ed39b947a1db80.tar.bz2 hercules-3455651a40c54646a4819e4c20ed39b947a1db80.tar.xz hercules-3455651a40c54646a4819e4c20ed39b947a1db80.zip | |
- Fixed Tarot Card of Fate using time instead of time2 which is the one that actually holds the effect duration.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5623 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index 743cde2c7..8d187ffa1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3542,6 +3542,13 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val return 0;
}
+ //SC duration reduction.
+ if(!(flag&(2|4)) && tick) {
+ tick = status_get_sc_tick(bl, type, tick);
+ if (tick <= 0)
+ return 0;
+ }
+
race=status_get_race(bl);
mode=status_get_mode(bl);
elem=status_get_elem_type(bl);
@@ -3792,13 +3799,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val sc->data[type].timer = -1;
}
- //SC duration reduction.
- if(!(flag&(2|4)) && tick) {
- tick = status_get_sc_tick(bl, type, tick);
- if (tick < 0)
- return 0;
- }
-
switch(type){ /* 異常の種類ごとの?理 */
case SC_PROVOKE: /* プロボック */
calc_flag = 1;
|