diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mercenary.c | 11 | ||||
| -rw-r--r-- | src/map/skill.c | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 4f39607b1..0da771e5b 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -735,12 +735,13 @@ int merc_create_homunculus_request(struct map_session_data *sd, int class_) return 1; } -int merc_resurrect_homunculus(struct map_session_data *sd, unsigned char per, short x, short y) +int merc_resurrect_homunculus(struct map_session_data* sd, unsigned char per, short x, short y) { - struct homun_data *hd; + struct homun_data* hd; nullpo_retr(0, sd); + if (!sd->status.hom_id) - return 0; + return 0; // no homunculus if (!sd->hd) //Load homun data; return intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id); @@ -748,10 +749,10 @@ int merc_resurrect_homunculus(struct map_session_data *sd, unsigned char per, sh hd = sd->hd; if (hd->homunculus.vaporize) - return 0; + return 0; // vaporized homunculi need to be 'called' if (!status_isdead(&hd->bl)) - return 0; + return 0; // already alive merc_hom_init_timers(hd); diff --git a/src/map/skill.c b/src/map/skill.c index 95c64e89c..1a500786d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8449,13 +8449,6 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t return 0; } break; - case AM_RESURRECTHOMUN: // Can't resurrect homun if you don't have a dead homun - if (!sd->status.hom_id || !sd->hd || sd->hd->homunculus.hp) - { - clif_skill_fail(sd,skill,0,0); - return 0; - } - break; } if(!(type&2)){ |