From 6c6cfb325ea28e5bf8d137e057eb0716b0b8a4d0 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 21 Mar 2007 16:03:12 +0000 Subject: - Cleaned up some the code of pc_equipitem and clif_parse_EquipItem git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10045 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index bfb6d5500..d95f78c87 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9237,20 +9237,24 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) if(sd->sc.data[SC_BLADESTOP].timer!=-1 || sd->sc.data[SC_BERSERK].timer!=-1 ) return; - if(!sd->status.inventory[index].identify) { // 未鑑定 + if(!sd->status.inventory[index].identify) { clif_equipitemack(sd,index,0,0); // fail return; } - //ペット用装備であるかないか - if(sd->inventory_data[index]) { - if(sd->inventory_data[index]->type != IT_PETARMOR){ - if(sd->inventory_data[index]->type == IT_AMMO) - pc_equipitem(sd,index,EQP_AMMO); //Client doesn't sends the position. - else - pc_equipitem(sd,index,RFIFOW(fd,4)); - } else - pet_equipitem(sd,index); + + if(!sd->inventory_data[index]) + return; + + if(sd->inventory_data[index]->type == IT_PETARMOR){ + pet_equipitem(sd,index); + return; } + + //Client doesn't sends the position for ammo. + if(sd->inventory_data[index]->type == IT_AMMO) + pc_equipitem(sd,index,EQP_AMMO); + else + pc_equipitem(sd,index,RFIFOW(fd,4)); } /*========================================== -- cgit v1.2.3-70-g09d2