diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-14 19:48:16 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-14 19:48:16 +0000 |
| commit | 5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100 (patch) | |
| tree | c12c5c2af8d5344166acfff7b2e7926f0c959362 /src/map/pc.c | |
| parent | b1ef0da5a7fdd3d48f758c3e8ec621a2d52650ab (diff) | |
| download | hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.gz hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.bz2 hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.xz hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.zip | |
- Sacrifice no longer shows damage to self.
- When Asura fails, the skill display will still come off.
- Cleaned up AM_CALLHOMUN so that the required item is specified on skill_require_db
- Cleaned up function merc_call_homun and added function merc_hom_vaporize to handle the respective cases.
- Cleaned up a bit unit_remove_map/unit_free on regards to homun. it will display the /sob emotion when the homun dies due to low intimacy. Moved removal of timers and all that to unit_free
- Cleaned up function merc_hom_dead
- Simplified lots of code around by using the new merc functions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8279 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 05eb21ee7..59d65aa0d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -671,7 +671,7 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t // Homunculus [albator] if (sd->status.hom_id > 0) - intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id); + intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id); // パ?ティ、ギルドデ?タの要求 if (sd->status.party_id > 0 && party_search(sd->status.party_id) == NULL) @@ -4783,14 +4783,8 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) pet_unlocktarget(sd->pd); } - if(sd->status.hom_id > 0 && sd->hd) //orn - { - sd->homunculus.vaporize = 1; - clif_hominfo(sd,sd->hd,0); - merc_stop_walking(sd->hd, 1) ; - merc_stop_attack(sd->hd) ; - merc_hom_delete(sd->hd,0); - } + if(sd->status.hom_id > 0) //orn + merc_hom_vaporize(sd, 0); // Leave duel if you die [LuzZza] if(battle_config.duel_autoleave_when_die) { |