summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-31 07:55:58 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-31 07:55:58 +0000
commit28b5e759f5e55f9b9ba508403dce2d02b98c154b (patch)
tree0a23176f0d5c97e45f43416b6e8c11e8a0f23365 /src/map
parent57867e8e384ed5b6921b71d8aa7a594d18bc889e (diff)
downloadhercules-28b5e759f5e55f9b9ba508403dce2d02b98c154b.tar.gz
hercules-28b5e759f5e55f9b9ba508403dce2d02b98c154b.tar.bz2
hercules-28b5e759f5e55f9b9ba508403dce2d02b98c154b.tar.xz
hercules-28b5e759f5e55f9b9ba508403dce2d02b98c154b.zip
* [Fixed]:
- nullpo in pet.c caused by equipping without checking if the pet is available. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6882 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index e704d756e..57fd3d5b3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9263,8 +9263,10 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
if(sd->inventory_data[index]->type == 10)
RFIFOW(fd,4)=0x8000; // 矢を無理やり装備できるように(−−;
pc_equipitem(sd,index,RFIFOW(fd,4));
- } else
- pet_equipitem(sd,index);
+ } else{
+ if(sd->pd)
+ pet_equipitem(sd,index);
+ }
}
}