From 77e8294908fcbf69431d87b74a8ed15d3ab5fd2e Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 16 Aug 2006 14:12:01 +0000 Subject: - Now arrow-consuming skills where your main weapon is a whip or musical instrument WILL count as arrow-type attacks, using the atk of the arrow and all related bonuses. - Fixed some homun timer initialization code. - Some cleanups on the pet.c code, but no idea if pet view will work correctly now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8315 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/pet.c') diff --git a/src/map/pet.c b/src/map/pet.c index e5b9efba2..3e63e1251 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -402,7 +402,7 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *pet) } sd->pd = pd = (struct pet_data *)aCalloc(1,sizeof(struct pet_data)); pd->petDB = &pet_db[i]; - memcpy(&pd->pet, pet, sizeof(pet)); + memcpy(&pd->pet, pet, sizeof(struct s_pet)); pd->bl.m = sd->bl.m; pd->bl.x = sd->bl.x; pd->bl.y = sd->bl.y; @@ -737,7 +737,7 @@ int pet_equipitem(struct map_session_data *sd,int index) pc_delitem(sd,index,1,0); pd->pet.equip = nameid; - status_set_viewdata(&pd->bl, pd->vd.class_); //Updates view_data. + status_set_viewdata(&pd->bl, pd->pet.class_); //Updates view_data. clif_pet_equip(pd); if (battle_config.pet_equip_required) { //Skotlex: start support timers if need @@ -766,7 +766,7 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd) nameid = pd->pet.equip; pd->pet.equip = 0; - status_set_viewdata(&pd->bl, pd->vd.class_); + status_set_viewdata(&pd->bl, pd->pet.class_); clif_pet_equip(pd); memset(&tmp_item,0,sizeof(tmp_item)); tmp_item.nameid = nameid; -- cgit v1.2.3-60-g2f50