Merge branch 'master' of github.com:HerculesWS/Hercules

1 files changed, 84 insertions, 117 deletions

diff --git a/src/map/searchstore.c b/src/map/searchstore.c
index cac79a242..7e1ee3e84 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/cbasetypes.h"
 #include "../common/malloc.h"  // aMalloc, aRealloc, aFree
@@ -12,8 +13,7 @@
 
 
 /// failure constants for clif functions
-enum e_searchstore_failure
-{
+enum e_searchstore_failure {
 	SSI_FAILED_NOTHING_SEARCH_ITEM         = 0,  // "No matching stores were found."
 	SSI_FAILED_OVER_MAXCOUNT               = 1,  // "There are too many results. Please enter more detailed search term."
 	SSI_FAILED_SEARCH_CNT                  = 2,  // "You cannot search anymore."
@@ -22,15 +22,13 @@ enum e_searchstore_failure
 };
 
 
-enum e_searchstore_searchtype
-{
+enum e_searchstore_searchtype {
 	SEARCHTYPE_VENDING      = 0,
 	SEARCHTYPE_BUYING_STORE = 1,
 };
 
 
-enum e_searchstore_effecttype
-{
+enum e_searchstore_effecttype {
 	EFFECTTYPE_NORMAL = 0,
 	EFFECTTYPE_CASH   = 1,
 	EFFECTTYPE_MAX
@@ -43,34 +41,28 @@ typedef bool (*searchstore_searchall_t)(struct map_session_data* sd, const struc
 
 
 /// retrieves search function by type
-static searchstore_search_t searchstore_getsearchfunc(unsigned char type)
-{
-	switch( type )
-	{
-		case SEARCHTYPE_VENDING:      return &vending_search;
-		case SEARCHTYPE_BUYING_STORE: return &buyingstore_search;
+static inline searchstore_search_t searchstore_getsearchfunc(unsigned char type) {
+	switch( type ) {
+		case SEARCHTYPE_VENDING:      return vending->search;
+		case SEARCHTYPE_BUYING_STORE: return buyingstore->search;
 	}
 	return NULL;
 }
 
 
 /// retrieves search-all function by type
-static searchstore_searchall_t searchstore_getsearchallfunc(unsigned char type)
-{
-	switch( type )
-	{
-		case SEARCHTYPE_VENDING:      return &vending_searchall;
-		case SEARCHTYPE_BUYING_STORE: return &buyingstore_searchall;
+static inline searchstore_searchall_t searchstore_getsearchallfunc(unsigned char type) {
+	switch( type ) {
+		case SEARCHTYPE_VENDING:      return vending->searchall;
+		case SEARCHTYPE_BUYING_STORE: return buyingstore->searchall;
 	}
 	return NULL;
 }
 
 
 /// checks if the player has a store by type
-static bool searchstore_hasstore(struct map_session_data* sd, unsigned char type)
-{
-	switch( type )
-	{
+static inline bool searchstore_hasstore(struct map_session_data* sd, unsigned char type) {
+	switch( type ) {
 		case SEARCHTYPE_VENDING:      return sd->state.vending;
 		case SEARCHTYPE_BUYING_STORE: return sd->state.buyingstore;
 	}
@@ -79,10 +71,8 @@ static bool searchstore_hasstore(struct map_session_data* sd, unsigned char type
 
 
 /// returns player's store id by type
-static int searchstore_getstoreid(struct map_session_data* sd, unsigned char type)
-{
-	switch( type )
-	{
+static inline unsigned int searchstore_getstoreid(struct map_session_data* sd, unsigned char type) {
+	switch( type ) {
 		case SEARCHTYPE_VENDING:      return sd->vender_id;
 		case SEARCHTYPE_BUYING_STORE: return sd->buyer_id;
 	}
@@ -90,15 +80,12 @@ static int searchstore_getstoreid(struct map_session_data* sd, unsigned char typ
 }
 
 
-bool searchstore_open(struct map_session_data* sd, unsigned int uses, unsigned short effect)
-{
-	if( !battle_config.feature_search_stores || sd->searchstore.open )
-	{
+bool searchstore_open(struct map_session_data* sd, unsigned int uses, unsigned short effect) {
+	if( !battle_config.feature_search_stores || sd->searchstore.open ) {
 		return false;
 	}
 
-	if( !uses || effect >= EFFECTTYPE_MAX )
-	{// invalid input
+	if( !uses || effect >= EFFECTTYPE_MAX ) {// invalid input
 		return false;
 	}
 
@@ -116,63 +103,53 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 {
 	unsigned int i;
 	struct map_session_data* pl_sd;
-	struct s_mapiterator* iter;
+	struct DBIterator *iter;
 	struct s_search_store_search s;
 	searchstore_searchall_t store_searchall;
 	time_t querytime;
 
-	if( !battle_config.feature_search_stores )
-	{
+	if( !battle_config.feature_search_stores ) {
 		return;
 	}
 
-	if( !sd->searchstore.open )
-	{
+	if( !sd->searchstore.open ) {
 		return;
 	}
 
-	if( ( store_searchall = searchstore_getsearchallfunc(type) ) == NULL )
-	{
+	if( ( store_searchall = searchstore_getsearchallfunc(type) ) == NULL ) {
 		ShowError("searchstore_query: Unknown search type %u (account_id=%d).\n", (unsigned int)type, sd->bl.id);
 		return;
 	}
 
 	time(&querytime);
 
-	if( sd->searchstore.nextquerytime > querytime )
-	{
+	if( sd->searchstore.nextquerytime > querytime ) {
 		clif->search_store_info_failed(sd, SSI_FAILED_LIMIT_SEARCH_TIME);
 		return;
 	}
 
-	if( !sd->searchstore.uses )
-	{
+	if( !sd->searchstore.uses ) {
 		clif->search_store_info_failed(sd, SSI_FAILED_SEARCH_CNT);
 		return;
 	}
 
 	// validate lists
-	for( i = 0; i < item_count; i++ )
-	{
-		if( !itemdb_exists(itemlist[i]) )
-		{
+	for( i = 0; i < item_count; i++ ) {
+		if( !itemdb_exists(itemlist[i]) ) {
 			ShowWarning("searchstore_query: Client resolved item %hu is not known.\n", itemlist[i]);
 			clif->search_store_info_failed(sd, SSI_FAILED_NOTHING_SEARCH_ITEM);
 			return;
 		}
 	}
-	for( i = 0; i < card_count; i++ )
-	{
-		if( !itemdb_exists(cardlist[i]) )
-		{
+	for( i = 0; i < card_count; i++ ) {
+		if( !itemdb_exists(cardlist[i]) ) {
 			ShowWarning("searchstore_query: Client resolved card %hu is not known.\n", cardlist[i]);
 			clif->search_store_info_failed(sd, SSI_FAILED_NOTHING_SEARCH_ITEM);
 			return;
 		}
 	}
 
-	if( max_price < min_price )
-	{
+	if( max_price < min_price ) {
 		swap(min_price, max_price);
 	}
 
@@ -181,7 +158,7 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 	sd->searchstore.nextquerytime = querytime+battle_config.searchstore_querydelay;
 
 	// drop previous results
-	searchstore_clear(sd);
+	searchstore->clear(sd);
 
 	// allocate max. amount of results
 	sd->searchstore.items = (struct s_search_store_info_item*)aMalloc(sizeof(struct s_search_store_info_item)*battle_config.searchstore_maxresults);
@@ -194,26 +171,22 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 	s.card_count = card_count;
 	s.min_price  = min_price;
 	s.max_price  = max_price;
-	iter         = mapit_geteachpc();
+	iter         = db_iterator(vending->db);
 
-	for( pl_sd = (struct map_session_data*)mapit_first(iter); mapit_exists(iter);  pl_sd = (struct map_session_data*)mapit_next(iter) )
-	{
-		if( sd == pl_sd )
-		{// skip own shop, if any
+	for( pl_sd = dbi_first(iter); dbi_exists(iter);  pl_sd = dbi_next(iter) ) {
+		if( sd == pl_sd ) {// skip own shop, if any
 			continue;
 		}
 
-		if( !store_searchall(pl_sd, &s) )
-		{// exceeded result size
+		if( !store_searchall(pl_sd, &s) ) {// exceeded result size
 			clif->search_store_info_failed(sd, SSI_FAILED_OVER_MAXCOUNT);
 			break;
 		}
 	}
 
-	mapit_free(iter);
+	dbi_destroy(iter);
 
-	if( sd->searchstore.count )
-	{
+	if( sd->searchstore.count ) {
 		// reclaim unused memory
 		sd->searchstore.items = (struct s_search_store_info_item*)aRealloc(sd->searchstore.items, sizeof(struct s_search_store_info_item)*sd->searchstore.count);
 
@@ -222,11 +195,9 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 
 		// one page displayed
 		sd->searchstore.pages++;
-	}
-	else
-	{
+	} else {
 		// cleanup
-		searchstore_clear(sd);
+		searchstore->clear(sd);
 
 		// update uses
 		clif->search_store_info_ack(sd);
@@ -238,10 +209,8 @@ void searchstore_query(struct map_session_data* sd, unsigned char type, unsigned
 
 
 /// checks whether or not more results are available for the client
-bool searchstore_querynext(struct map_session_data* sd)
-{
-	if( sd->searchstore.count && ( sd->searchstore.count-1 )/SEARCHSTORE_RESULTS_PER_PAGE < sd->searchstore.pages )
-	{
+bool searchstore_querynext(struct map_session_data* sd) {
+	if( sd->searchstore.count && ( sd->searchstore.count-1 )/SEARCHSTORE_RESULTS_PER_PAGE < sd->searchstore.pages ) {
 		return true;
 	}
 
@@ -249,8 +218,7 @@ bool searchstore_querynext(struct map_session_data* sd)
 }
 
 
-void searchstore_next(struct map_session_data* sd)
-{
+void searchstore_next(struct map_session_data* sd) {
 	if( !battle_config.feature_search_stores || !sd->searchstore.open || sd->searchstore.count <= sd->searchstore.pages*SEARCHSTORE_RESULTS_PER_PAGE )
 	{// nothing (more) to display
 		return;
@@ -264,12 +232,10 @@ void searchstore_next(struct map_session_data* sd)
 }
 
 
-void searchstore_clear(struct map_session_data* sd)
-{
-	searchstore_clearremote(sd);
+void searchstore_clear(struct map_session_data* sd) {
+	searchstore->clearremote(sd);
 
-	if( sd->searchstore.items )
-	{// release results
+	if( sd->searchstore.items ) {// release results
 		aFree(sd->searchstore.items);
 		sd->searchstore.items = NULL;
 	}
@@ -279,11 +245,9 @@ void searchstore_clear(struct map_session_data* sd)
 }
 
 
-void searchstore_close(struct map_session_data* sd)
-{
-	if( sd->searchstore.open )
-	{
-		searchstore_clear(sd);
+void searchstore_close(struct map_session_data* sd) {
+	if( sd->searchstore.open ) {
+		searchstore->clear(sd);
 
 		sd->searchstore.uses = 0;
 		sd->searchstore.open = false;
@@ -291,58 +255,49 @@ void searchstore_close(struct map_session_data* sd)
 }
 
 
-void searchstore_click(struct map_session_data* sd, int account_id, int store_id, unsigned short nameid)
-{
+void searchstore_click(struct map_session_data* sd, int account_id, int store_id, unsigned short nameid) {
 	unsigned int i;
 	struct map_session_data* pl_sd;
 	searchstore_search_t store_search;
 
-	if( !battle_config.feature_search_stores || !sd->searchstore.open || !sd->searchstore.count )
-	{
+	if( !battle_config.feature_search_stores || !sd->searchstore.open || !sd->searchstore.count ) {
 		return;
 	}
 
-	searchstore_clearremote(sd);
+	searchstore->clearremote(sd);
 
 	ARR_FIND( 0, sd->searchstore.count, i,  sd->searchstore.items[i].store_id == store_id && sd->searchstore.items[i].account_id == account_id && sd->searchstore.items[i].nameid == nameid );
-	if( i == sd->searchstore.count )
-	{// no such result, crafted
+	if( i == sd->searchstore.count ) {// no such result, crafted
 		ShowWarning("searchstore_click: Received request with item %hu of account %d, which is not part of current result set (account_id=%d, char_id=%d).\n", nameid, account_id, sd->bl.id, sd->status.char_id);
 		clif->search_store_info_failed(sd, SSI_FAILED_SSILIST_CLICK_TO_OPEN_STORE);
 		return;
 	}
 
-	if( ( pl_sd = map_id2sd(account_id) ) == NULL )
-	{// no longer online
+	if( ( pl_sd = map_id2sd(account_id) ) == NULL ) {// no longer online
 		clif->search_store_info_failed(sd, SSI_FAILED_SSILIST_CLICK_TO_OPEN_STORE);
 		return;
 	}
 
-	if( !searchstore_hasstore(pl_sd, sd->searchstore.type) || searchstore_getstoreid(pl_sd, sd->searchstore.type) != store_id )
-	{// no longer vending/buying or not same shop
+	if( !searchstore_hasstore(pl_sd, sd->searchstore.type) || searchstore_getstoreid(pl_sd, sd->searchstore.type) != store_id ) {
+		// no longer vending/buying or not same shop
 		clif->search_store_info_failed(sd, SSI_FAILED_SSILIST_CLICK_TO_OPEN_STORE);
 		return;
 	}
 
 	store_search = searchstore_getsearchfunc(sd->searchstore.type);
 
-	if( !store_search(pl_sd, nameid) )
-	{// item no longer being sold/bought
+	if( !store_search(pl_sd, nameid) ) {// item no longer being sold/bought
 		clif->search_store_info_failed(sd, SSI_FAILED_SSILIST_CLICK_TO_OPEN_STORE);
 		return;
 	}
 
-	switch( sd->searchstore.effect )
-	{
+	switch( sd->searchstore.effect ) {
 		case EFFECTTYPE_NORMAL:
 			// display coords
 
-			if( sd->bl.m != pl_sd->bl.m )
-			{// not on same map, wipe previous marker
+			if( sd->bl.m != pl_sd->bl.m ) {// not on same map, wipe previous marker
 				clif->search_store_info_click_ack(sd, -1, -1);
-			}
-			else
-			{
+			} else {
 				clif->search_store_info_click_ack(sd, pl_sd->bl.x, pl_sd->bl.y);
 			}
 
@@ -353,10 +308,9 @@ void searchstore_click(struct map_session_data* sd, int account_id, int store_id
 			// to bypass range checks
 			sd->searchstore.remote_id = account_id;
 
-			switch( sd->searchstore.type )
-			{
-				case SEARCHTYPE_VENDING:      vending_vendinglistreq(sd, account_id); break;
-				case SEARCHTYPE_BUYING_STORE: buyingstore_open(sd, account_id);       break;
+			switch( sd->searchstore.type ) {
+				case SEARCHTYPE_VENDING:      vending->list(sd, account_id); break;
+				case SEARCHTYPE_BUYING_STORE: buyingstore->open(sd, account_id);       break;
 			}
 
 			break;
@@ -368,26 +322,23 @@ void searchstore_click(struct map_session_data* sd, int account_id, int store_id
 
 
 /// checks whether or not sd has opened account_id's shop remotely
-bool searchstore_queryremote(struct map_session_data* sd, int account_id)
-{
+bool searchstore_queryremote(struct map_session_data* sd, int account_id) {
 	return (bool)( sd->searchstore.open && sd->searchstore.count && sd->searchstore.remote_id == account_id );
 }
 
 
 /// removes range-check bypassing for remotely opened stores
-void searchstore_clearremote(struct map_session_data* sd)
-{
+void searchstore_clearremote(struct map_session_data* sd) {
 	sd->searchstore.remote_id = 0;
 }
 
 
 /// receives results from a store-specific callback
-bool searchstore_result(struct map_session_data* sd, int store_id, int account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short* card, unsigned char refine)
+bool searchstore_result(struct map_session_data* sd, unsigned int store_id, int account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short* card, unsigned char refine)
 {
 	struct s_search_store_info_item* ssitem;
 
-	if( sd->searchstore.count >= (unsigned int)battle_config.searchstore_maxresults )
-	{// no more
+	if( sd->searchstore.count >= (unsigned int)battle_config.searchstore_maxresults ) {// no more
 		return false;
 	}
 
@@ -403,3 +354,19 @@ bool searchstore_result(struct map_session_data* sd, int store_id, int account_i
 
 	return true;
 }
+
+void searchstore_defaults (void) {
+	searchstore = &searchstore_s;
+	
+	searchstore->open = searchstore_open;
+	searchstore->query = searchstore_query;
+	searchstore->querynext = searchstore_querynext;
+	searchstore->next = searchstore_next;
+	searchstore->clear = searchstore_clear;
+	searchstore->close = searchstore_close;
+	searchstore->click = searchstore_click;
+	searchstore->queryremote = searchstore_queryremote;
+	searchstore->clearremote = searchstore_clearremote;
+	searchstore->result = searchstore_result;
+	
+}