diff options
| author | shennetsind <ind@henn.et> | 2013-04-22 18:28:18 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-04-22 18:28:18 -0300 |
| commit | 19b8cbb835e867febb597b34187f6bbca48cbe7b (patch) | |
| tree | 02ffe058dc91d2b79c81783cbd50afc295c25d76 /src/map/pet.c | |
| parent | d8d392b0a37c122b303d04e92ebc7fb826e53bce (diff) | |
| download | hercules-19b8cbb835e867febb597b34187f6bbca48cbe7b.tar.gz hercules-19b8cbb835e867febb597b34187f6bbca48cbe7b.tar.bz2 hercules-19b8cbb835e867febb597b34187f6bbca48cbe7b.tar.xz hercules-19b8cbb835e867febb597b34187f6bbca48cbe7b.zip | |
Hercules April 22 MEGA-ULTRA-LONG Patch~!
http://hercules.ws/board/topic/470-hercules-april-22-patch/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index e7057145d..c85092a01 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -595,7 +595,7 @@ int pet_menu(struct map_session_data *sd,int menunum) egg_id = itemdb_exists(sd->pd->petDB->EggID); if (egg_id) { if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) { - clif_displaymessage(sd->fd, msg_txt(451)); // You can't return your pet because your inventory is full. + clif->message(sd->fd, msg_txt(451)); // You can't return your pet because your inventory is full. return 1; } } @@ -885,7 +885,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, uns } } - if(!target && pd->loot && pd->loot->count < pd->loot->max && DIFF_TICK(tick,pd->ud.canact_tick)>0) { + if(!target && pd->loot && pd->msd && pc_has_permission(pd->msd, PC_PERM_TRADE) && pd->loot->count < pd->loot->max && DIFF_TICK(tick,pd->ud.canact_tick)>0) { //Use half the pet's range of sight. map_foreachinrange(pet_ai_sub_hard_lootsearch,&pd->bl, pd->db->range2/2, BL_ITEM,pd,&target); |