diff options
| author | Haru <haru@dotalux.com> | 2019-10-18 16:53:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 16:53:38 +0200 |
| commit | 9fb69836caaa3bc46ad1109c3aa9df8ee60cc6fe (patch) | |
| tree | 26c58b5cbadfe5731ef1902b50e1c095b8321a66 /src/map/status.h | |
| parent | 29b587ae936fc76828cb3982de8c43caaea5fe86 (diff) | |
| parent | 9e5994866305ef23628020d1605fac43305c2105 (diff) | |
| download | hercules-9fb69836caaa3bc46ad1109c3aa9df8ee60cc6fe.tar.gz hercules-9fb69836caaa3bc46ad1109c3aa9df8ee60cc6fe.tar.bz2 hercules-9fb69836caaa3bc46ad1109c3aa9df8ee60cc6fe.tar.xz hercules-9fb69836caaa3bc46ad1109c3aa9df8ee60cc6fe.zip | |
Merge pull request #2551 from guilherme-gm/201910-fix-sc-times
Fixes status changes effect timer when relogging
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/status.h b/src/map/status.h index 536003d04..e2280e409 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -2138,6 +2138,7 @@ struct sc_display_entry { struct status_change_entry { int timer; + int total_tick; int val1,val2,val3,val4; bool infinite_duration; }; @@ -2306,6 +2307,7 @@ struct status_interface { int (*isimmune) (struct block_list *bl); int (*get_sc_def) (struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int tick, int flag); int (*change_start) (struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag); + int (*change_start_sub) (struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int total_tick, int flag); int (*change_end_) (struct block_list* bl, enum sc_type type, int tid, const char* file, int line); bool (*is_immune_to_status) (struct status_change* sc, enum sc_type type); bool (*is_boss_resist_sc) (enum sc_type type); @@ -2314,7 +2316,7 @@ struct status_interface { int (*change_start_set_option) (struct block_list *bl, struct status_change* sc, enum sc_type type, int val1, int val2, int val3, int val4); int (*get_val_flag) (enum sc_type type); void (*change_start_display) (struct map_session_data *sd, enum sc_type type, int val1, int val2, int val3, int val4); - bool (*change_start_unknown_sc) (struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int tick, int flag); + bool (*change_start_unknown_sc) (struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag); int (*kaahi_heal_timer) (int tid, int64 tick, int id, intptr_t data); int (*change_timer) (int tid, int64 tick, int id, intptr_t data); int (*change_timer_sub) (struct block_list* bl, va_list ap); |