diff options
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index ef0ade4fd..d9743332a 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -258,9 +258,9 @@ static int pet_hungry(int tid,unsigned int tick,int id,int data) pd->status.speed = pd->db->status.speed; } status_calc_pet(pd, 0); - clif_send_petdata(sd,1,pd->pet.intimate); + clif_send_petdata(sd,pd,1,pd->pet.intimate); } - clif_send_petdata(sd,2,pd->pet.hungry); + clif_send_petdata(sd,pd,2,pd->pet.hungry); if(battle_config.pet_hungry_delay_rate != 100) interval = (pd->petDB->hungry_delay*battle_config.pet_hungry_delay_rate)/100; @@ -461,9 +461,9 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *pet) if(sd->bl.prev != NULL) { map_addblock(&sd->pd->bl); clif_spawn(&sd->pd->bl); - clif_send_petdata(sd,0,0); - clif_send_petdata(sd,5,battle_config.pet_hair_style); - clif_pet_equip(sd->pd); + clif_send_petdata(sd,sd->pd, 0,0); + clif_send_petdata(sd,sd->pd, 5,battle_config.pet_hair_style); + clif_pet_equip_area(sd->pd); clif_send_petstatus(sd); } Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); @@ -503,9 +503,9 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag) if(sd->pd && sd->bl.prev != NULL) { map_addblock(&sd->pd->bl); clif_spawn(&sd->pd->bl); - clif_send_petdata(sd,0,0); - clif_send_petdata(sd,5,battle_config.pet_hair_style); - clif_pet_equip(sd->pd); + clif_send_petdata(sd,sd->pd,0,0); + clif_send_petdata(sd,sd->pd,5,battle_config.pet_hair_style); + clif_pet_equip_area(sd->pd); clif_send_petstatus(sd); } } @@ -690,7 +690,7 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag) memcpy(pd->pet.name, name, NAME_LENGTH); clif_charnameack (0,&pd->bl); pd->pet.rename_flag = 1; - clif_pet_equip(pd); + clif_pet_equip_area(pd); clif_send_petstatus(sd); return 1; } @@ -714,7 +714,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->pet.class_); //Updates view_data. - clif_pet_equip(pd); + clif_pet_equip_area(pd); if (battle_config.pet_equip_required) { //Skotlex: start support timers if need unsigned int tick = gettick(); @@ -743,7 +743,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->pet.class_); - clif_pet_equip(pd); + clif_pet_equip_area(pd); memset(&tmp_item,0,sizeof(tmp_item)); tmp_item.nameid = nameid; tmp_item.identify = 1; @@ -813,8 +813,8 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd) if(pd->pet.hungry > 100) pd->pet.hungry = 100; - clif_send_petdata(sd,2,pd->pet.hungry); - clif_send_petdata(sd,1,pd->pet.intimate); + clif_send_petdata(sd,pd,2,pd->pet.hungry); + clif_send_petdata(sd,pd,1,pd->pet.intimate); clif_pet_food(sd,pd->petDB->FoodID,1); return 0; |