diff options
author | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
---|---|---|
committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
commit | 8489dbf3b58d3bff70b27ea42884a14d5229430a (patch) | |
tree | 89e0f9be6b3bc7c3ebc135fc311d9f6d6ebbfeec /src/map/pet.c | |
parent | de7919f0f59f47473e6de709b5d5287a4a55e18d (diff) | |
parent | 2154c0fa9cee582a36f9a8d7923a646a6d47adf0 (diff) | |
download | hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.gz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.bz2 hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.xz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pet.c')
-rw-r--r-- | src/map/pet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 00402f9d4..e6ef0a488 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -408,7 +408,7 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *pet) intif_save_petdata(sd->status.account_id,pet); if (iMap->save_settings&8) - chrif_save(sd,0); //is it REALLY Needed to save the char for hatching a pet? [Skotlex] + chrif->save(sd,0); //is it REALLY Needed to save the char for hatching a pet? [Skotlex] if(sd->bl.prev != NULL) { iMap->addblock(&sd->pd->bl); @@ -592,7 +592,7 @@ int pet_menu(struct map_session_data *sd,int menunum) if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incuvate) return 1; - egg_id = itemdb_exists(sd->pd->petDB->EggID); + egg_id = itemdb->exists(sd->pd->petDB->EggID); if (egg_id) { if ((egg_id->flag.trade_restriction&0x01) && !pc->inventoryblank(sd)) { clif->message(sd->fd, msg_txt(451)); // You can't return your pet because your inventory is full. |