- Cleaned up (fixed?) a possible overflow in pc_isUseitem, thanks to foobar.

- When you have the wrong ammo-type equipped the skill-failed message is now "skill can't be used with this weapon", which is less misleading than "please equip arrows first".
- Corrected pet-equipment display (I originally assumed they went in the shield view-position, when they actually go in the head-bottom position).


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5883 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 28a9e230f..7aa584d9c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -946,7 +946,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
 	}

 	WBUFW(buf,14)=vd->class_;

 	WBUFW(buf,16)=vd->hair_style;  //Required for pets.

-	WBUFW(buf,22)=vd->shield;	//Pet armor

+	WBUFW(buf,20)=vd->head_bottom;	//Pet armor

 	if (bl->type == BL_NPC && vd->class_ == 722)

 	{	//The hell, why flags work like this?

 		WBUFL(buf,22)=emblem_id;

@@ -1069,8 +1069,8 @@ static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit
 	}

 	WBUFW(buf,14)=vd->class_;

 	WBUFW(buf,16)=vd->hair_style; //For pets

+	WBUFW(buf,20)=vd->head_bottom;	//Pet armor

 	WBUFL(buf,22)=gettick();

-	WBUFW(buf,26)=vd->shield;	//Pet armor

 	WBUFW(buf,36)=unit_getdir(bl);

 	WBUFL(buf,38)=guild_id;

 	WBUFL(buf,42)=emblem_id;