From a25b1a1f0fb28d4262cdbf22bcc7727b576a876a Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 26 Dec 2010 15:02:31 +0000 Subject: * Fixed opening other player's vending terminating currently running NPC conversation. Vending is now unavailable when talking to an NPC (bugreport:2208). * Fixed vending not accepting 0 Zeny as sell price. The client asks for confirmation when you attempt to sell items at 0 Zeny (bugreport:2595, since r918 and r11344). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14628 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 14b7aa16e..c5796555a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10872,10 +10872,11 @@ void clif_parse_CloseVending(int fd, struct map_session_data* sd) *------------------------------------------*/ void clif_parse_VendingListReq(int fd, struct map_session_data* sd) { - vending_vendinglistreq(sd,RFIFOL(fd,2)); - if( sd->npc_id ) - npc_event_dequeue(sd); + {// using an NPC + return; + } + vending_vendinglistreq(sd,RFIFOL(fd,2)); } /*========================================== -- cgit v1.2.3-70-g09d2