summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-23 14:59:51 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-23 14:59:51 +0000
commitc45d93d9d873996f99829dfc506c7875ea13d24c (patch)
tree19dcfcbf374369ba433e63c6ed800d707eb05176 /src/map/pc.c
parent94281a398ef3a288a23cebb9f2d9a5227c570996 (diff)
downloadhercules-c45d93d9d873996f99829dfc506c7875ea13d24c.tar.gz
hercules-c45d93d9d873996f99829dfc506c7875ea13d24c.tar.bz2
hercules-c45d93d9d873996f99829dfc506c7875ea13d24c.tar.xz
hercules-c45d93d9d873996f99829dfc506c7875ea13d24c.zip
- Added column `mer_id` on char_db
- More mercenary implementations (delete, load, create) - Some fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13117 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 0d173927d..4cd983768 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -917,8 +917,10 @@ int pc_reg_received(struct map_session_data *sd)
intif_request_petdata(sd->status.account_id, sd->status.char_id, sd->status.pet_id);
// Homunculus [albator]
- if (sd->status.hom_id > 0)
+ if( sd->status.hom_id > 0 )
intif_homunculus_requestload(sd->status.account_id, sd->status.hom_id);
+ if( sd->status.mer_id > 0 )
+ intif_mercenary_request(sd->status.mer_id, sd->status.char_id);
map_addiddb(&sd->bl);
map_delnickdb(sd->status.char_id, sd->status.name);