- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 334 insertions, 320 deletions

diff --git a/src/map/vending.c b/src/map/vending.c
index c796d77e5..0f8255788 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -25,379 +25,393 @@ static int vending_nextid = 0;
 /// Returns an unique vending shop id.
 static int vending_getuid(void)
 {
-    return vending_nextid++;
+	return vending_nextid++;
 }
 
 /*==========================================
  * Close shop
  *------------------------------------------*/
-void vending_closevending(struct map_session_data *sd)
+void vending_closevending(struct map_session_data* sd)
 {
-    nullpo_retv(sd);
+	nullpo_retv(sd);
 
-    if (sd->state.vending) {
-        sd->state.vending = false;
-        clif_closevendingboard(&sd->bl, 0);
-    }
+	if( sd->state.vending )
+	{
+		sd->state.vending = false;
+		clif_closevendingboard(&sd->bl, 0);
+	}
 }
 
 /*==========================================
  * Request a shop's item list
  *------------------------------------------*/
-void vending_vendinglistreq(struct map_session_data *sd, int id)
+void vending_vendinglistreq(struct map_session_data* sd, int id)
 {
-    struct map_session_data *vsd;
-    nullpo_retv(sd);
+	struct map_session_data* vsd;
+	nullpo_retv(sd);
 
-    if ((vsd = map_id2sd(id)) == NULL)
-        return;
-    if (!vsd->state.vending)
-        return; // not vending
+	if( (vsd = map_id2sd(id)) == NULL )
+		return;
+	if( !vsd->state.vending )
+		return; // not vending
 
-    if (!pc_can_give_items(sd) || !pc_can_give_items(vsd)) { //check if both GMs are allowed to trade
-        // GM is not allowed to trade
-        clif_displaymessage(sd->fd, msg_txt(246));
-        return;
-    }
+	if (!pc_can_give_items(sd) || !pc_can_give_items(vsd)) //check if both GMs are allowed to trade
+	{	// GM is not allowed to trade
+		clif_displaymessage(sd->fd, msg_txt(246));
+		return;
+	} 
 
-    sd->vended_id = vsd->vender_id;  // register vending uid
+	sd->vended_id = vsd->vender_id;  // register vending uid
 
-    clif_vendinglist(sd, id, vsd->vending);
+	clif_vendinglist(sd, id, vsd->vending);
 }
 
 /*==========================================
  * Purchase item(s) from a shop
  *------------------------------------------*/
-void vending_purchasereq(struct map_session_data *sd, int aid, int uid, const uint8 *data, int count)
+void vending_purchasereq(struct map_session_data* sd, int aid, int uid, const uint8* data, int count)
 {
-    int i, j, cursor, w, new_ = 0, blank, vend_list[MAX_VENDING];
-    double z;
-    struct s_vending vending[MAX_VENDING]; // against duplicate packets
-    struct map_session_data *vsd = map_id2sd(aid);
-
-    nullpo_retv(sd);
-    if (vsd == NULL || !vsd->state.vending || vsd->bl.id == sd->bl.id)
-        return; // invalid shop
-
-    if (vsd->vender_id != uid) {
-        // shop has changed
-        clif_buyvending(sd, 0, 0, 6);  // store information was incorrect
-        return;
-    }
-
-    if (!searchstore_queryremote(sd, aid) && (sd->bl.m != vsd->bl.m || !check_distance_bl(&sd->bl, &vsd->bl, AREA_SIZE)))
-        return; // shop too far away
-
-    searchstore_clearremote(sd);
-
-    if (count < 1 || count > MAX_VENDING || count > vsd->vend_num)
-        return; // invalid amount of purchased items
-
-    blank = pc_inventoryblank(sd); //number of free cells in the buyer's inventory
-
-    // duplicate item in vending to check hacker with multiple packets
-    memcpy(&vending, &vsd->vending, sizeof(vsd->vending)); // copy vending list
-
-    // some checks
-    z = 0.; // zeny counter
-    w = 0;  // weight counter
-    for (i = 0; i < count; i++) {
-        short amount = *(uint16 *)(data + 4*i + 0);
-        short idx    = *(uint16 *)(data + 4*i + 2);
-        idx -= 2;
-
-        if (amount <= 0)
-            return;
-
-        // check of item index in the cart
-        if (idx < 0 || idx >= MAX_CART)
-            return;
-
-        ARR_FIND(0, vsd->vend_num, j, vsd->vending[j].index == idx);
-        if (j == vsd->vend_num)
-            return; //picked non-existing item
-        else
-            vend_list[i] = j;
-
-        z += ((double)vsd->vending[j].value * (double)amount);
-        if (z > (double)sd->status.zeny || z < 0. || z > (double)MAX_ZENY) {
-            clif_buyvending(sd, idx, amount, 1); // you don't have enough zeny
-            return;
-        }
-        if (z + (double)vsd->status.zeny > (double)MAX_ZENY && !battle_config.vending_over_max) {
-            clif_buyvending(sd, idx, vsd->vending[j].amount, 4); // too much zeny = overflow
-            return;
-
-        }
-        w += itemdb_weight(vsd->status.cart[idx].nameid) * amount;
-        if (w + sd->weight > sd->max_weight) {
-            clif_buyvending(sd, idx, amount, 2); // you can not buy, because overweight
-            return;
-        }
-
-        //Check to see if cart/vend info is in sync.
-        if (vending[j].amount > vsd->status.cart[idx].amount)
-            vending[j].amount = vsd->status.cart[idx].amount;
-
-        // if they try to add packets (example: get twice or more 2 apples if marchand has only 3 apples).
-        // here, we check cumulative amounts
-        if (vending[j].amount < amount) {
-            // send more quantity is not a hack (an other player can have buy items just before)
-            clif_buyvending(sd, idx, vsd->vending[j].amount, 4); // not enough quantity
-            return;
-        }
-
-        vending[j].amount -= amount;
-
-        switch (pc_checkadditem(sd, vsd->status.cart[idx].nameid, amount)) {
-            case ADDITEM_EXIST:
-                break;  //We'd add this item to the existing one (in buyers inventory)
-            case ADDITEM_NEW:
-                new_++;
-                if (new_ > blank)
-                    return; //Buyer has no space in his inventory
-                break;
-            case ADDITEM_OVERAMOUNT:
-                return; //too many items
-        }
-    }
-
-    pc_payzeny(sd, (int)z, LOG_TYPE_VENDING, vsd);
-    if (battle_config.vending_tax)
-        z -= z * (battle_config.vending_tax/10000.);
-    pc_getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd);
-
-    for (i = 0; i < count; i++) {
-        short amount = *(uint16 *)(data + 4*i + 0);
-        short idx    = *(uint16 *)(data + 4*i + 2);
-        idx -= 2;
-
-        // vending item
-        pc_additem(sd, &vsd->status.cart[idx], amount, LOG_TYPE_VENDING);
-        vsd->vending[vend_list[i]].amount -= amount;
-        pc_cart_delitem(vsd, idx, amount, 0, LOG_TYPE_VENDING);
-        clif_vendingreport(vsd, idx, amount);
-
-        //print buyer's name
-        if (battle_config.buyer_name) {
-            char temp[256];
-            sprintf(temp, msg_txt(265), sd->status.name);
-            clif_disp_onlyself(vsd,temp,strlen(temp));
-        }
-    }
-
-    // compact the vending list
-    for (i = 0, cursor = 0; i < vsd->vend_num; i++) {
-        if (vsd->vending[i].amount == 0)
-            continue;
-
-        if (cursor != i) { // speedup
-            vsd->vending[cursor].index = vsd->vending[i].index;
-            vsd->vending[cursor].amount = vsd->vending[i].amount;
-            vsd->vending[cursor].value = vsd->vending[i].value;
-        }
-
-        cursor++;
-    }
-    vsd->vend_num = cursor;
-
-    //Always save BOTH: buyer and customer
-    if (save_settings&2) {
-        chrif_save(sd,0);
-        chrif_save(vsd,0);
-    }
-
-    //check for @AUTOTRADE users [durf]
-    if (vsd->state.autotrade) {
-        //see if there is anything left in the shop
-        ARR_FIND(0, vsd->vend_num, i, vsd->vending[i].amount > 0);
-        if (i == vsd->vend_num) {
-            //Close Vending (this was automatically done by the client, we have to do it manually for autovenders) [Skotlex]
-            vending_closevending(vsd);
-            map_quit(vsd);  //They have no reason to stay around anymore, do they?
-        }
-    }
+	int i, j, cursor, w, new_ = 0, blank, vend_list[MAX_VENDING];
+	double z;
+	struct s_vending vending[MAX_VENDING]; // against duplicate packets
+	struct map_session_data* vsd = map_id2sd(aid);
+
+	nullpo_retv(sd);
+	if( vsd == NULL || !vsd->state.vending || vsd->bl.id == sd->bl.id )
+		return; // invalid shop
+
+	if( vsd->vender_id != uid )
+	{// shop has changed
+		clif_buyvending(sd, 0, 0, 6);  // store information was incorrect
+		return;
+	}
+
+	if( !searchstore_queryremote(sd, aid) && ( sd->bl.m != vsd->bl.m || !check_distance_bl(&sd->bl, &vsd->bl, AREA_SIZE) ) )
+		return; // shop too far away
+
+	searchstore_clearremote(sd);
+
+	if( count < 1 || count > MAX_VENDING || count > vsd->vend_num )
+		return; // invalid amount of purchased items
+
+	blank = pc_inventoryblank(sd); //number of free cells in the buyer's inventory
+
+	// duplicate item in vending to check hacker with multiple packets
+	memcpy(&vending, &vsd->vending, sizeof(vsd->vending)); // copy vending list
+
+	// some checks
+	z = 0.; // zeny counter
+	w = 0;  // weight counter
+	for( i = 0; i < count; i++ )
+	{
+		short amount = *(uint16*)(data + 4*i + 0);
+		short idx    = *(uint16*)(data + 4*i + 2);
+		idx -= 2;
+
+		if( amount <= 0 )
+			return;
+
+		// check of item index in the cart
+		if( idx < 0 || idx >= MAX_CART )
+			return;
+
+		ARR_FIND( 0, vsd->vend_num, j, vsd->vending[j].index == idx );
+		if( j == vsd->vend_num )
+			return; //picked non-existing item
+		else
+			vend_list[i] = j;
+
+		z += ((double)vsd->vending[j].value * (double)amount);
+		if( z > (double)sd->status.zeny || z < 0. || z > (double)MAX_ZENY )
+		{
+			clif_buyvending(sd, idx, amount, 1); // you don't have enough zeny
+			return;
+		}
+		if( z + (double)vsd->status.zeny > (double)MAX_ZENY && !battle_config.vending_over_max )
+		{
+			clif_buyvending(sd, idx, vsd->vending[j].amount, 4); // too much zeny = overflow
+			return;
+
+		}
+		w += itemdb_weight(vsd->status.cart[idx].nameid) * amount;
+		if( w + sd->weight > sd->max_weight )
+		{
+			clif_buyvending(sd, idx, amount, 2); // you can not buy, because overweight
+			return;
+		}
+		
+		//Check to see if cart/vend info is in sync.
+		if( vending[j].amount > vsd->status.cart[idx].amount )
+			vending[j].amount = vsd->status.cart[idx].amount;
+		
+		// if they try to add packets (example: get twice or more 2 apples if marchand has only 3 apples).
+		// here, we check cumulative amounts
+		if( vending[j].amount < amount )
+		{
+			// send more quantity is not a hack (an other player can have buy items just before)
+			clif_buyvending(sd, idx, vsd->vending[j].amount, 4); // not enough quantity
+			return;
+		}
+		
+		vending[j].amount -= amount;
+
+		switch( pc_checkadditem(sd, vsd->status.cart[idx].nameid, amount) ) {
+		case ADDITEM_EXIST:
+			break;	//We'd add this item to the existing one (in buyers inventory)
+		case ADDITEM_NEW:
+			new_++;
+			if (new_ > blank)
+				return; //Buyer has no space in his inventory
+			break;
+		case ADDITEM_OVERAMOUNT:
+			return; //too many items
+		}
+	}
+
+	pc_payzeny(sd, (int)z, LOG_TYPE_VENDING, vsd);
+	if( battle_config.vending_tax )
+		z -= z * (battle_config.vending_tax/10000.);
+	pc_getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd);
+
+	for( i = 0; i < count; i++ )
+	{
+		short amount = *(uint16*)(data + 4*i + 0);
+		short idx    = *(uint16*)(data + 4*i + 2);
+		idx -= 2;
+
+		// vending item
+		pc_additem(sd, &vsd->status.cart[idx], amount, LOG_TYPE_VENDING);
+		vsd->vending[vend_list[i]].amount -= amount;
+		pc_cart_delitem(vsd, idx, amount, 0, LOG_TYPE_VENDING);
+		clif_vendingreport(vsd, idx, amount);
+
+		//print buyer's name
+		if( battle_config.buyer_name )
+		{
+			char temp[256];
+			sprintf(temp, msg_txt(265), sd->status.name);
+			clif_disp_onlyself(vsd,temp,strlen(temp));
+		}
+	}
+
+	// compact the vending list
+	for( i = 0, cursor = 0; i < vsd->vend_num; i++ )
+	{
+		if( vsd->vending[i].amount == 0 )
+			continue;
+		
+		if( cursor != i ) // speedup
+		{
+			vsd->vending[cursor].index = vsd->vending[i].index;
+			vsd->vending[cursor].amount = vsd->vending[i].amount;
+			vsd->vending[cursor].value = vsd->vending[i].value;
+		}
+
+		cursor++;
+	}
+	vsd->vend_num = cursor;
+
+	//Always save BOTH: buyer and customer
+	if( save_settings&2 )
+	{
+		chrif_save(sd,0);
+		chrif_save(vsd,0);
+	}
+
+	//check for @AUTOTRADE users [durf]
+	if( vsd->state.autotrade )
+	{
+		//see if there is anything left in the shop
+		ARR_FIND( 0, vsd->vend_num, i, vsd->vending[i].amount > 0 );
+		if( i == vsd->vend_num )
+		{
+			//Close Vending (this was automatically done by the client, we have to do it manually for autovenders) [Skotlex]
+			vending_closevending(vsd);
+			map_quit(vsd);	//They have no reason to stay around anymore, do they?
+		}
+	}
 }
-static int vending_checknearnpc_sub(struct block_list *bl, va_list args)
-{
-    struct npc_data *nd = (struct npc_data *)bl;
-
-    if (nd->sc.option & (OPTION_HIDE|OPTION_INVISIBLE))
+static int vending_checknearnpc_sub(struct block_list* bl, va_list args) {
+    struct npc_data *nd = (struct npc_data*)bl;
+    
+    if( nd->sc.option & (OPTION_HIDE|OPTION_INVISIBLE) )
         return 0;
 
     return 1;
 }
-bool vending_checknearnpc(struct block_list *bl)
-{
-
-    if (battle_config.min_npc_vending_distance > 0 &&
-        map_foreachinrange(vending_checknearnpc_sub,bl, battle_config.min_npc_vending_distance, BL_NPC))
+bool vending_checknearnpc(struct block_list * bl) {
+    
+    if( battle_config.min_npc_vending_distance > 0 &&
+            map_foreachinrange(vending_checknearnpc_sub,bl, battle_config.min_npc_vending_distance, BL_NPC) )
         return true;
-
+        
     return false;
 }
 /*==========================================
  * Open shop
  * data := {<index>.w <amount>.w <value>.l}[count]
  *------------------------------------------*/
-void vending_openvending(struct map_session_data *sd, const char *message, bool flag, const uint8 *data, int count)
-{
-    int i, j;
-    int vending_skill_lvl;
-    nullpo_retv(sd);
-
-    if (!flag)  // cancelled
-        return; // nothing to do
-
-    if (pc_isdead(sd) || !sd->state.prevend || pc_istrading(sd))
-        return; // can't open vendings lying dead || didn't use via the skill (wpe/hack) || can't have 2 shops at once
-
-    vending_skill_lvl = pc_checkskill(sd, MC_VENDING);
-    // skill level and cart check
-    if (!vending_skill_lvl || !pc_iscarton(sd)) {
-        clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
-        return;
-    }
-
-    // check number of items in shop
-    if (count < 1 || count > MAX_VENDING || count > 2 + vending_skill_lvl) {
-        // invalid item count
-        clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
-        return;
-    }
-    //check if nearby npc, (perhaps we should check for nearby shop too
-    if (vending_checknearnpc(&sd->bl)) {
+void vending_openvending(struct map_session_data* sd, const char* message, bool flag, const uint8* data, int count) {
+	int i, j;
+	int vending_skill_lvl;
+	nullpo_retv(sd);
+
+	if( !flag ) // cancelled
+		return; // nothing to do
+
+	if ( pc_isdead(sd) || !sd->state.prevend || pc_istrading(sd))
+		return; // can't open vendings lying dead || didn't use via the skill (wpe/hack) || can't have 2 shops at once
+
+	vending_skill_lvl = pc_checkskill(sd, MC_VENDING);
+	// skill level and cart check
+	if( !vending_skill_lvl || !pc_iscarton(sd) )
+	{
+		clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
+		return;
+	}
+
+	// check number of items in shop
+	if( count < 1 || count > MAX_VENDING || count > 2 + vending_skill_lvl )
+	{	// invalid item count
+		clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
+		return;
+	}
+	//check if nearby npc, (perhaps we should check for nearby shop too
+    if( vending_checknearnpc(&sd->bl) ) {
         char output[150];
         sprintf(output,"You're too close to a NPC, you must be at least %d cells away from any NPC.",battle_config.min_npc_vending_distance);
         clif_displaymessage(sd->fd, output);
         clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0);
         return;
     }
-
-
-    // filter out invalid items
-    i = 0;
-    for (j = 0; j < count; j++) {
-        short index        = *(uint16 *)(data + 8*j + 0);
-        short amount       = *(uint16 *)(data + 8*j + 2);
-        unsigned int value = *(uint32 *)(data + 8*j + 4);
-
-        index -= 2; // offset adjustment (client says that the first cart position is 2)
-
-        if (index < 0 || index >= MAX_CART // invalid position
-            ||  pc_cartitem_amount(sd, index, amount) < 0 // invalid item or insufficient quantity
-            //NOTE: official server does not do any of the following checks!
-            ||  !sd->status.cart[index].identify // unidentified item
-            ||  sd->status.cart[index].attribute == 1 // broken item
-            ||  sd->status.cart[index].expire_time // It should not be in the cart but just in case
-            ||  !itemdb_cantrade(&sd->status.cart[index], pc_get_group_level(sd), pc_get_group_level(sd)))  // untradeable item
-            continue;
-
-        sd->vending[i].index = index;
-        sd->vending[i].amount = amount;
-        sd->vending[i].value = cap_value(value, 0, (unsigned int)battle_config.vending_max_value);
-
-        i++; // item successfully added
-    }
-
-    if (i != j)
-        clif_displaymessage(sd->fd, msg_txt(266));  //"Some of your items cannot be vended and were removed from the shop."
-
-    if (i == 0) {
-        // no valid item found
-        clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0); // custom reply packet
-        return;
-    }
-    sd->state.prevend = 0;
-    sd->state.vending = true;
-    sd->vender_id = vending_getuid();
-    sd->vend_num = i;
-    safestrncpy(sd->message, message, MESSAGE_SIZE);
-
-    pc_stop_walking(sd,1);
-    clif_openvending(sd,sd->bl.id,sd->vending);
-    clif_showvendingboard(&sd->bl,message,0);
+        
+    
+	// filter out invalid items
+	i = 0;
+	for( j = 0; j < count; j++ )
+	{
+		short index        = *(uint16*)(data + 8*j + 0);
+		short amount       = *(uint16*)(data + 8*j + 2);
+		unsigned int value = *(uint32*)(data + 8*j + 4);
+
+		index -= 2; // offset adjustment (client says that the first cart position is 2)
+
+		if( index < 0 || index >= MAX_CART // invalid position
+		||  pc_cartitem_amount(sd, index, amount) < 0 // invalid item or insufficient quantity
+		//NOTE: official server does not do any of the following checks!
+		||  !sd->status.cart[index].identify // unidentified item
+		||  sd->status.cart[index].attribute == 1 // broken item
+		||  sd->status.cart[index].expire_time // It should not be in the cart but just in case
+		||  !itemdb_cantrade(&sd->status.cart[index], pc_get_group_level(sd), pc_get_group_level(sd)) ) // untradeable item
+			continue;
+
+		sd->vending[i].index = index;
+		sd->vending[i].amount = amount;
+		sd->vending[i].value = cap_value(value, 0, (unsigned int)battle_config.vending_max_value);
+
+		i++; // item successfully added
+	}
+
+	if( i != j )
+		clif_displaymessage (sd->fd, msg_txt(266)); //"Some of your items cannot be vended and were removed from the shop."
+
+	if( i == 0 )
+	{	// no valid item found
+		clif_skill_fail(sd, MC_VENDING, USESKILL_FAIL_LEVEL, 0); // custom reply packet
+		return;
+	}
+	sd->state.prevend = 0;
+	sd->state.vending = true;
+	sd->vender_id = vending_getuid();
+	sd->vend_num = i;
+	safestrncpy(sd->message, message, MESSAGE_SIZE);
+
+	pc_stop_walking(sd,1);
+	clif_openvending(sd,sd->bl.id,sd->vending);
+	clif_showvendingboard(&sd->bl,message,0);
 }
 
 
 /// Checks if an item is being sold in given player's vending.
-bool vending_search(struct map_session_data *sd, unsigned short nameid)
+bool vending_search(struct map_session_data* sd, unsigned short nameid)
 {
-    int i;
+	int i;
 
-    if (!sd->state.vending) {
-        // not vending
-        return false;
-    }
+	if( !sd->state.vending )
+	{// not vending
+		return false;
+	}
 
-    ARR_FIND(0, sd->vend_num, i, sd->status.cart[sd->vending[i].index].nameid == (short)nameid);
-    if (i == sd->vend_num) {
-        // not found
-        return false;
-    }
+	ARR_FIND( 0, sd->vend_num, i, sd->status.cart[sd->vending[i].index].nameid == (short)nameid );
+	if( i == sd->vend_num )
+	{// not found
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 
 /// Searches for all items in a vending, that match given ids, price and possible cards.
 /// @return Whether or not the search should be continued.
-bool vending_searchall(struct map_session_data *sd, const struct s_search_store_search *s)
+bool vending_searchall(struct map_session_data* sd, const struct s_search_store_search* s)
 {
-    int i, c, slot;
-    unsigned int idx, cidx;
-    struct item *it;
-
-    if (!sd->state.vending) {
-        // not vending
-        return true;
-    }
-
-    for (idx = 0; idx < s->item_count; idx++) {
-        ARR_FIND(0, sd->vend_num, i, sd->status.cart[sd->vending[i].index].nameid == (short)s->itemlist[idx]);
-        if (i == sd->vend_num) {
-            // not found
-            continue;
-        }
-        it = &sd->status.cart[sd->vending[i].index];
-
-        if (s->min_price && s->min_price > sd->vending[i].value) {
-            // too low price
-            continue;
-        }
-
-        if (s->max_price && s->max_price < sd->vending[i].value) {
-            // too high price
-            continue;
-        }
-
-        if (s->card_count) {
-            // check cards
-            if (itemdb_isspecial(it->card[0])) {
-                // something, that is not a carded
-                continue;
-            }
-            slot = itemdb_slot(it->nameid);
-
-            for (c = 0; c < slot && it->card[c]; c ++) {
-                ARR_FIND(0, s->card_count, cidx, s->cardlist[cidx] == it->card[c]);
-                if (cidx != s->card_count) {
-                    // found
-                    break;
-                }
-            }
-
-            if (c == slot || !it->card[c]) {
-                // no card match
-                continue;
-            }
-        }
-
-        if (!searchstore_result(s->search_sd, sd->vender_id, sd->status.account_id, sd->message, it->nameid, sd->vending[i].amount, sd->vending[i].value, it->card, it->refine)) {
-            // result set full
-            return false;
-        }
-    }
-
-    return true;
+	int i, c, slot;
+	unsigned int idx, cidx;
+	struct item* it;
+
+	if( !sd->state.vending )
+	{// not vending
+		return true;
+	}
+
+	for( idx = 0; idx < s->item_count; idx++ )
+	{
+		ARR_FIND( 0, sd->vend_num, i, sd->status.cart[sd->vending[i].index].nameid == (short)s->itemlist[idx] );
+		if( i == sd->vend_num )
+		{// not found
+			continue;
+		}
+		it = &sd->status.cart[sd->vending[i].index];
+
+		if( s->min_price && s->min_price > sd->vending[i].value )
+		{// too low price
+			continue;
+		}
+
+		if( s->max_price && s->max_price < sd->vending[i].value )
+		{// too high price
+			continue;
+		}
+
+		if( s->card_count )
+		{// check cards
+			if( itemdb_isspecial(it->card[0]) )
+			{// something, that is not a carded
+				continue;
+			}
+			slot = itemdb_slot(it->nameid);
+
+			for( c = 0; c < slot && it->card[c]; c ++ )
+			{
+				ARR_FIND( 0, s->card_count, cidx, s->cardlist[cidx] == it->card[c] );
+				if( cidx != s->card_count )
+				{// found
+					break;
+				}
+			}
+
+			if( c == slot || !it->card[c] )
+			{// no card match
+				continue;
+			}
+		}
+
+		if( !searchstore_result(s->search_sd, sd->vender_id, sd->status.account_id, sd->message, it->nameid, sd->vending[i].amount, sd->vending[i].value, it->card, it->refine) )
+		{// result set full
+			return false;
+		}
+	}
+
+	return true;
 }