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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/trade.c b/src/map/trade.c
index f469f4b28..c44f04884 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -206,13 +206,13 @@ int impossible_trade_check(struct map_session_data *sd)
 			intif_wis_message_to_gm(iMap->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm);
 			// if we block people
 			if (battle_config.ban_hack_trade < 0) {
-				chrif_char_ask_name(-1, sd->status.name, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block
+				chrif->char_ask_name(-1, sd->status.name, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block
 				set_eof(sd->fd); // forced to disconnect because of the hack
 				// message about the ban
 				strcpy(message_to_gm, msg_txt(540)); //  This player has been definitively blocked.
 			// if we ban people
 			} else if (battle_config.ban_hack_trade > 0) {
-				chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, 0, battle_config.ban_hack_trade, 0); // type: 2 - ban (year, month, day, hour, minute, second)
+				chrif->char_ask_name(-1, sd->status.name, 2, 0, 0, 0, 0, battle_config.ban_hack_trade, 0); // type: 2 - ban (year, month, day, hour, minute, second)
 				set_eof(sd->fd); // forced to disconnect because of the hack
 				// message about the ban
 				sprintf(message_to_gm, msg_txt(507), battle_config.ban_hack_trade); //  This player has been banned for %d minute(s).
@@ -257,7 +257,7 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd)
 			if (amount > inventory[n].amount)
 				return 0; //qty Exploit?
 
-			data = itemdb_search(inventory[n].nameid);
+			data = itemdb->search(inventory[n].nameid);
 			i = MAX_INVENTORY;
 			if (itemdb_isstackable2(data)) { //Stackable item.
 				for(i = 0; i < MAX_INVENTORY; i++)
@@ -288,7 +288,7 @@ int trade_check(struct map_session_data *sd, struct map_session_data *tsd)
 		if (amount > inventory2[n].amount)
 			return 0;
 		// search if it's possible to add item (for full inventory)
-		data = itemdb_search(inventory2[n].nameid);
+		data = itemdb->search(inventory2[n].nameid);
 		i = MAX_INVENTORY;
 		if (itemdb_isstackable2(data)) {
 			for(i = 0; i < MAX_INVENTORY; i++)
@@ -603,8 +603,8 @@ void trade_tradecommit(struct map_session_data *sd)
 	// save both player to avoid crash: they always have no advantage/disadvantage between the 2 players
 	if (iMap->save_settings&1)
   	{
-		chrif_save(sd,0);
-		chrif_save(tsd,0);
+		chrif->save(sd,0);
+		chrif->save(tsd,0);
 	}
 }
 
@@ -621,4 +621,4 @@ void trade_defaults(void)
 	trade->ok = trade_tradeok;
 	trade->cancel = trade_tradecancel;
 	trade->commit = trade_tradecommit;
-}
\ No newline at end of file
+}