From e71b9760374db9f0958dc8b9861d5f20d1d626a7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 16 Feb 2006 01:10:56 +0000 Subject: - Fixed pets displaying "strangely" when they did not have their pet armor git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5291 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index ebc065bde..6b9f2d71b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1578,7 +1578,7 @@ static int clif_pet0078(struct pet_data *pd, unsigned char *buf) { WBUFW(buf,6)=pd->speed; WBUFW(buf,14)=view_class; WBUFW(buf,16)=battle_config.pet_hair_style; - if((view_class = itemdb_viewid(pd->equip)) > 0) + if(pd->equip && (view_class = itemdb_viewid(pd->equip)) > 0) WBUFW(buf,20)=view_class; else WBUFW(buf,20)=pd->equip; @@ -1680,7 +1680,7 @@ static int clif_pet007b(struct pet_data *pd, unsigned char *buf) { WBUFW(buf,6)=pd->speed; WBUFW(buf,14)=view_class; WBUFW(buf,16)=battle_config.pet_hair_style; - if ((view_class = itemdb_viewid(pd->equip)) > 0) + if (pd->equip && (view_class = itemdb_viewid(pd->equip)) > 0) WBUFW(buf,20)=view_class; else WBUFW(buf,20)=pd->equip; @@ -6958,7 +6958,7 @@ int clif_pet_equip(struct pet_data *pd,int nameid) WBUFW(buf,0)=0x1a4; WBUFB(buf,2)=3; WBUFL(buf,3)=pd->bl.id; - if((view = itemdb_viewid(nameid)) > 0) + if(nameid && (view = itemdb_viewid(nameid)) > 0) WBUFL(buf,7)=view; else WBUFL(buf,7)=nameid; -- cgit v1.2.3-70-g09d2