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/map.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/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 62570b913..93508d966 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1670,8 +1670,7 @@ int map_quit(struct map_session_data *sd) { sd->state.waitingdisconnect = 1; if (sd->pd) unit_free(&sd->pd->bl); - if(sd->status.hom_id > 0 && sd->hd) //[orn] - merc_hom_delete(sd->hd, 2) ; + if (sd->hd) unit_free(&sd->hd->bl); unit_free(&sd->bl); chrif_save(sd,1); } else { //Try to free some data, without saving anything (this could be invoked on map server change. [Skotlex] |