diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
| commit | 5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1 (patch) | |
| tree | b3b02e05f343a3e24b7cceb34ce04bbb8721ed1c /src/map/chrif.c | |
| parent | 5ea7b8b9e172ed16fda6ee5a051ae0dbb767b4ac (diff) | |
| parent | aefa8d6bd88e5056080f45ed89f86258f1bf81d7 (diff) | |
| download | hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.gz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.bz2 hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.xz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index c2067dbd1..0fd14cd28 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1184,7 +1184,7 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the continue; if (sc->data[i]->timer != INVALID_TIMER) { timer = iTimer->get_timer(sc->data[i]->timer); - if (timer == NULL || timer->func != status_change_timer || DIFF_TICK(timer->tick,tick) < 0) + if (timer == NULL || timer->func != iStatus->change_timer || DIFF_TICK(timer->tick,tick) < 0) continue; data.tick = DIFF_TICK(timer->tick,tick); //Duration that is left before ending. } else @@ -1237,7 +1237,7 @@ int chrif_load_scdata(int fd) { for (i = 0; i < count; i++) { data = (struct status_change_data*)RFIFOP(fd,14 + i*sizeof(struct status_change_data)); - status_change_start(&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); + iStatus->change_start(&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); } #endif |