diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-11 03:33:20 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-11 03:33:20 +0800 |
| commit | c5f3bd02ecb8e204f67a7343e6b0916a9267b744 (patch) | |
| tree | 5f4ecf9f1fc13030c521cfa5ba73f4359ddfd8be | |
| parent | ff145549f389e63be01234ddf778905700883d20 (diff) | |
| parent | e971e0d8dcb25864a9affb4775bce8b8033d869a (diff) | |
| download | hercules-c5f3bd02ecb8e204f67a7343e6b0916a9267b744.tar.gz hercules-c5f3bd02ecb8e204f67a7343e6b0916a9267b744.tar.bz2 hercules-c5f3bd02ecb8e204f67a7343e6b0916a9267b744.tar.xz hercules-c5f3bd02ecb8e204f67a7343e6b0916a9267b744.zip | |
Merge pull request #412 from 4144/mapinterfaces
HPM Hooks Update. (Thanks 4114)
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 4 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index eb7394b9e..763af64b7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3875,7 +3875,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1 case MS_MAGNUM: if( flag&1 ) { //Damage depends on distance, so add it to flag if it is > 1 - skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag|distance_bl(src, bl)); + skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag|distance_bl(src, bl)); } break; diff --git a/src/map/status.c b/src/map/status.c index 9fbda4b59..6d4b8d5fa 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8072,10 +8072,10 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t if(sd && val2 == SL_HIGH) { int stat,max_stat; // Fetch target's stats - struct status_data* status2 = status_get_status_data(bl); // Battle status + struct status_data* status2 = status->get_status_data(bl); // Battle status val3 = 0; val4 = 0; - max_stat = (status_get_lv(bl)-10<50)?status_get_lv(bl)-10:50; + max_stat = (status->get_lv(bl)-10<50)?status->get_lv(bl)-10:50; stat = max(0, max_stat - status2->str ); val3 |= cap_value(stat,0,0xFF)<<16; stat = max(0, max_stat - status2->agi ); val3 |= cap_value(stat,0,0xFF)<<8; stat = max(0, max_stat - status2->vit ); val3 |= cap_value(stat,0,0xFF); diff --git a/src/map/unit.c b/src/map/unit.c index 243a7c28a..64885541f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -399,7 +399,7 @@ int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { } if(ud->state.change_walk_target) { - if(unit_walktoxy_sub(bl)) { + if(unit->walktoxy_sub(bl)) { return 1; } else { clif->fixpos(bl); |