pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
KimLS
2013-05-23 12:50:34 -07:00
parent ce63503bab 815c3dc73f
commit a3e24b6854
214 changed files with 2422 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/trading.cpp
+6 -6
View File
@@ -18,7 +18,7 @@
#include "../common/debug.h"
#include "masterentity.h"
#include "StringIDs.h"
#include "../common/MiscFunctions.h"
#include "../common/StringUtil.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "worldserver.h"
@@ -856,7 +856,7 @@ void Client::Trader_EndTrader() {
void Client::SendTraderItem(uint32 ItemID, uint16 Quantity) {
string Packet;
std::string Packet;
int16 FreeSlotID=0;
const Item_Struct* item = database.GetItem(ItemID);
@@ -1381,7 +1381,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
char errbuf[MYSQL_ERRMSG_SIZE];
char* Query = 0;
string Search, Values;
std::string Search, Values;
MYSQL_RES *Result;
MYSQL_ROW Row;
char Tmp[100] = {0};
@@ -1399,7 +1399,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
}
}
string SearchrResults;
std::string SearchrResults;
if(MinPrice != 0){
sprintf(Tmp, " and trader.item_cost>=%i", MinPrice);
@@ -2017,7 +2017,7 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) {
char errbuf[MYSQL_ERRMSG_SIZE];
char* Query = 0;
char ItemName[64];
string Search, Values;
std::string Search, Values;
MYSQL_RES *Result;
MYSQL_ROW Row;
@@ -2150,7 +2150,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
char errbuf[MYSQL_ERRMSG_SIZE];
char* Query = 0;
char ItemName[64];
string Search, Values;
std::string Search, Values;
MYSQL_RES *Result;
MYSQL_ROW Row;