Skip to content

Commit

Permalink
Remove completly 'using namespace std' usage!
Browse files Browse the repository at this point in the history 
Also remove almost all relative pathing in includes

Yes that was a long commit one...
  • Loading branch information
@cyberium
cyberium committed Mar 6, 2024
1 parent 95a814f commit 79e70fa
Show file tree
Hide file tree
Showing 634 changed files with 5,935 additions and 6,025 deletions.
94 changes: 47 additions & 47 deletions ahbot/AhBot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bool AhBot::HandleAhBotCommand(ChatHandler* handler, char const* args)

uint32 AhBot::auctionIds[MAX_AUCTIONS] = {1,6,7};
uint32 AhBot::auctioneers[MAX_AUCTIONS] = {79707,4656,23442};
map<uint32, uint32> AhBot::factions;
std::map<uint32, uint32> AhBot::factions;

void AhBot::Init()
{
Expand Down Expand Up @@ -118,7 +118,7 @@ void AhBot::ForceUpdate()
if (updating)
return;

string msg = "AhBot is now checking auctions in the background";
std::string msg = "AhBot is now checking auctions in the background";
sLog.outString("%s", msg.c_str());
//ostringstream out1; out1 << "|c070cc700 " << msg << " |r";
//sWorld.SendWorldText(3, out1.str().c_str());
Expand Down Expand Up @@ -179,10 +179,10 @@ struct SortByPricePredicate
}
};

vector<AuctionEntry*> AhBot::LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap,
std::vector<AuctionEntry*> AhBot::LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap,
Category*& category, int& auction)
{
vector<AuctionEntry*> entries;
std::vector<AuctionEntry*> entries;
for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionEntryMap.begin();
itr != auctionEntryMap.end(); ++itr)
{
Expand All @@ -207,7 +207,7 @@ vector<AuctionEntry*> AhBot::LoadAuctions(const AuctionHouseObject::AuctionEntry

entries.push_back(entry);
}
sort(entries.begin(), entries.end(), SortByPricePredicate());
std::sort(entries.begin(), entries.end(), SortByPricePredicate());
return entries;
}

Expand Down Expand Up @@ -253,8 +253,8 @@ int AhBot::Answer(int auction, Category* category, ItemBag* inAuctionItems)
const AuctionHouseObject::AuctionEntryMap& auctionEntryMap = auctionHouse->GetAuctions();
int64 availableMoney = GetAvailableMoney(auctionIds[auction]);

vector<AuctionEntry*> entries = LoadAuctions(auctionEntryMap, category, auction);
for (vector<AuctionEntry*>::iterator itr = entries.begin(); itr != entries.end(); ++itr)
std::vector<AuctionEntry*> entries = LoadAuctions(auctionEntryMap, category, auction);
for (std::vector<AuctionEntry*>::iterator itr = entries.begin(); itr != entries.end(); ++itr)
{
AuctionEntry *entry = *itr;
uint32 owner = entry->owner;
Expand All @@ -270,8 +270,8 @@ int AhBot::Answer(int auction, Category* category, ItemBag* inAuctionItems)
continue;

const ItemPrototype* proto = item->GetProto();
vector<uint32> items = availableItems.Get(category);
if (find(items.begin(), items.end(), proto->ItemId) == items.end())
std::vector<uint32> items = availableItems.Get(category);
if (std::find(items.begin(), items.end(), proto->ItemId) == items.end())
{
sLog.outDetail( "%s (x%d) in auction %d: unavailable item",
item->GetProto()->Name1, item->GetCount(), auctionIds[auction]);
Expand Down Expand Up @@ -392,7 +392,7 @@ int AhBot::Answer(int auction, Category* category, ItemBag* inAuctionItems)
return answered;
}

uint32 AhBot::GetTime(string category, uint32 id, uint32 auctionHouse, uint32 type)
uint32 AhBot::GetTime(std::string category, uint32 id, uint32 auctionHouse, uint32 type)
{
auto results = CharacterDatabase.PQuery("SELECT MAX(buytime) FROM ahbot_history WHERE item = '%u' AND won = '%u' AND auction_house = '%u' AND category = '%s'",
id, type, factions[auctionHouse], category.c_str());
Expand All @@ -406,7 +406,7 @@ uint32 AhBot::GetTime(string category, uint32 id, uint32 auctionHouse, uint32 ty
return result;
}

void AhBot::SetTime(string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value)
void AhBot::SetTime(std::string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value)
{
CharacterDatabase.PExecute("DELETE FROM ahbot_history WHERE item = '%u' AND won = '%u' AND auction_house = '%u' AND category = '%s'",
id, type, factions[auctionHouse], category.c_str());
Expand All @@ -425,7 +425,7 @@ uint32 AhBot::GetBuyTime(uint32 entry, uint32 itemId, uint32 auctionHouse, Categ

uint32 result = entryTime;

string categoryName = category->GetName();
std::string categoryName = category->GetName();
uint32 categoryTime = GetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY);
uint32 itemTime = GetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY);

Expand All @@ -435,7 +435,7 @@ uint32 AhBot::GetBuyTime(uint32 entry, uint32 itemId, uint32 auctionHouse, Categ
double rarity = category->GetPricingStrategy()->GetRarityPriceMultiplier(itemId);
categoryTime += urand(sAhBotConfig.itemBuyMinInterval, sAhBotConfig.itemBuyMaxInterval) * priceLevel;
itemTime += urand(sAhBotConfig.itemBuyMinInterval, sAhBotConfig.itemBuyMaxInterval) * priceLevel / rarity;
entryTime = max(categoryTime, itemTime);
entryTime = std::max(categoryTime, itemTime);

SetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY, categoryTime);
SetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY, itemTime);
Expand All @@ -448,25 +448,25 @@ uint32 AhBot::GetSellTime(uint32 itemId, uint32 auctionHouse, Category*& categor
{
uint32 itemSellTime = GetTime("item", itemId, auctionHouse, AHBOT_SELL_DELAY);
uint32 itemBuyTime = GetTime("item", itemId, auctionHouse, AHBOT_WON_DELAY);
uint32 itemTime = max(itemSellTime, itemBuyTime);
uint32 itemTime = std::max(itemSellTime, itemBuyTime);

if (itemTime > time(0))
return itemTime;

uint32 result = itemTime;

string categoryName = category->GetDisplayName();
std::string categoryName = category->GetDisplayName();
uint32 categorySellTime = GetTime(categoryName, 0, auctionHouse, AHBOT_SELL_DELAY);
uint32 categoryBuyTime = GetTime(categoryName, 0, auctionHouse, AHBOT_WON_DELAY);
uint32 categoryTime = max(categorySellTime, categoryBuyTime);
uint32 categoryTime = std::max(categorySellTime, categoryBuyTime);

if (categoryTime < time(0)) categoryTime = time(0);
if (itemTime < time(0)) itemTime = time(0);

double rarity = category->GetPricingStrategy()->GetRarityPriceMultiplier(itemId);
categoryTime += urand(sAhBotConfig.itemSellMinInterval, sAhBotConfig.itemSellMaxInterval);
itemTime += urand(sAhBotConfig.itemSellMinInterval, sAhBotConfig.itemSellMaxInterval) * rarity;
itemTime = max(itemTime, categoryTime);
itemTime = std::max(itemTime, categoryTime);

SetTime(categoryName, 0, auctionHouse, AHBOT_SELL_DELAY, categoryTime);
SetTime("item", itemId, auctionHouse, AHBOT_SELL_DELAY, itemTime);
Expand All @@ -476,15 +476,15 @@ uint32 AhBot::GetSellTime(uint32 itemId, uint32 auctionHouse, Category*& categor

int AhBot::AddAuctions(int auction, Category* category, ItemBag* inAuctionItems)
{
vector<uint32>& inAuction = inAuctionItems->Get(category);
std::vector<uint32>& inAuction = inAuctionItems->Get(category);

int32 maxAllowedAuctionCount = categoryMaxAuctionCount[category->GetDisplayName()];
if (inAuctionItems->GetCount(category) >= maxAllowedAuctionCount)
return 0;

int added = 0;
int ladded = 0;
vector<uint32> available = availableItems.Get(category);
std::vector<uint32> available = availableItems.Get(category);
for (int32 i = 0; i <= maxAllowedAuctionCount && available.size() > 0 && inAuctionItems->GetCount(category) < maxAllowedAuctionCount; ++i)
{
uint32 index = urand(0, available.size() - 1);
Expand Down Expand Up @@ -536,7 +536,7 @@ int AhBot::AddAuction(int auction, Category* category, ItemPrototype const* prot
return 0;
}

string name;
std::string name;
if (!sObjectMgr.GetPlayerNameByGUID(ObjectGuid(HIGHGUID_PLAYER, owner), name))
return 0;

Expand Down Expand Up @@ -608,7 +608,7 @@ int AhBot::AddAuction(int auction, Category* category, ItemPrototype const* prot
return 1;
}

void AhBot::HandleCommand(string command)
void AhBot::HandleCommand(std::string command)
{
if (!sAhBotConfig.enabled)
return;
Expand Down Expand Up @@ -662,11 +662,11 @@ void AhBot::HandleCommand(string command)
Category* category = CategoryList::instance[i];
if (category->Contains(proto))
{
vector<uint32> items = availableItems.Get(category);
if (find(items.begin(), items.end(), proto->ItemId) == items.end())
std::vector<uint32> items = availableItems.Get(category);
if (std::find(items.begin(), items.end(), proto->ItemId) == items.end())
continue;

ostringstream out;
std::ostringstream out;
out << proto->Name1 << " (" << category->GetDisplayName() << "), "
<< category->GetMaxAllowedAuctionCount() << "x" << category->GetMaxAllowedItemAuctionCount(proto)
<< "x" << category->GetStackCount(proto) << " max"
Expand All @@ -678,11 +678,11 @@ void AhBot::HandleCommand(string command)
<< GetAvailableMoney(auctionIds[auction])
<< ") ---\n";

ostringstream exp1;
std::ostringstream exp1;
out << "sell: " << ChatHelper::formatMoney(category->GetPricingStrategy()->GetSellPrice(proto, auctionIds[auction], true, &exp1));
out << " (" << exp1.str().c_str() << ")\n";

ostringstream exp2;
std::ostringstream exp2;
out << "buy: " << ChatHelper::formatMoney(category->GetPricingStrategy()->GetBuyPrice(proto, auctionIds[auction], &exp2));
out << " (" << exp2.str().c_str() << ")\n";

Expand Down Expand Up @@ -750,7 +750,7 @@ void AhBot::AddToHistory(AuctionEntry* entry, uint32 won)
if (!proto)
return;

string category = "";
std::string category = "";
for (int i = 0; i < CategoryList::instance.size(); i++)
{
if (CategoryList::instance[i]->Contains(proto))
Expand Down Expand Up @@ -807,7 +807,7 @@ uint32 AhBot::GetAvailableMoney(uint32 auctionHouse)
{
int64 result = sAhBotConfig.alwaysAvailableMoney;

map<uint32, uint32> data;
std::map<uint32, uint32> data;
data[AHBOT_WON_PLAYER] = 0;
data[AHBOT_WON_SELF] = 0;

Expand Down Expand Up @@ -868,10 +868,10 @@ void AhBot::CheckCategoryMultipliers()

CharacterDatabase.PExecute("DELETE FROM ahbot_category");

set<string> tmp;
std::set<std::string> tmp;
for (int i = 0; i < CategoryList::instance.size(); i++)
{
string name = CategoryList::instance[i]->GetDisplayName();
std::string name = CategoryList::instance[i]->GetDisplayName();

if (tmp.find(name) != tmp.end())
continue;
Expand Down Expand Up @@ -925,15 +925,15 @@ bool AhBot::IsBotAuction(uint32 bidder)

uint32 AhBot::GetRandomBidder(uint32 auctionHouse)
{
vector<uint32> guids = bidders[factions[auctionHouse]];
std::vector<uint32> guids = bidders[factions[auctionHouse]];
if (guids.empty())
return 0;

vector<uint32> online;
for (vector<uint32>::iterator i = guids.begin(); i != guids.end(); ++i)
std::vector<uint32> online;
for (std::vector<uint32>::iterator i = guids.begin(); i != guids.end(); ++i)
{
uint32 guid = *i;
string name;
std::string name;
if (!sObjectMgr.GetPlayerNameByGUID(ObjectGuid(HIGHGUID_PLAYER, guid), name))
continue;

Expand All @@ -949,7 +949,7 @@ uint32 AhBot::GetRandomBidder(uint32 auctionHouse)

void AhBot::LoadRandomBots()
{
for (list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); i++)
for (std::list<uint32>::iterator i = sPlayerbotAIConfig.randomBotAccounts.begin(); i != sPlayerbotAIConfig.randomBotAccounts.end(); i++)
{
uint32 accountId = *i;
if (!sAccountMgr.GetCharactersCount(accountId))
Expand Down Expand Up @@ -997,8 +997,8 @@ int32 AhBot::GetSellPrice(ItemPrototype const* proto)
if (!category->Contains(proto))
continue;

vector<uint32> items = availableItems.Get(category);
if (find(items.begin(), items.end(), proto->ItemId) == items.end())
std::vector<uint32> items = availableItems.Get(category);
if (std::find(items.begin(), items.end(), proto->ItemId) == items.end())
continue;

for (int auction = 0; auction < MAX_AUCTIONS; auction++)
Expand Down Expand Up @@ -1027,8 +1027,8 @@ int32 AhBot::GetBuyPrice(ItemPrototype const* proto)
if (!category->Contains(proto))
continue;

vector<uint32> items = availableItems.Get(category);
if (find(items.begin(), items.end(), proto->ItemId) == items.end())
std::vector<uint32> items = availableItems.Get(category);
if (std::find(items.begin(), items.end(), proto->ItemId) == items.end())
continue;

for (int auction = 0; auction < MAX_AUCTIONS; auction++)
Expand Down Expand Up @@ -1104,7 +1104,7 @@ void AhBot::CheckSendMail(uint32 bidder, uint32 price, AuctionEntry *entry)
}
}

ostringstream body;
std::ostringstream body;
body << "Hello,\n";
body << "\n";
Item *item = sAuctionMgr.GetAItem(entry->itemGuidLow);
Expand All @@ -1116,13 +1116,13 @@ void AhBot::CheckSendMail(uint32 bidder, uint32 price, AuctionEntry *entry)
body << "\n";
body << "Regards,\n";

string name;
std::string name;
if (!sObjectMgr.GetPlayerNameByGUID(ObjectGuid(HIGHGUID_PLAYER, bidder), name))
return;

body << name << "\n";

ostringstream title; title << "AH Proposition: " << item->GetProto()->Name1;
std::ostringstream title; title << "AH Proposition: " << item->GetProto()->Name1;
MailDraft draft(title.str(), body.str());
ObjectGuid receiverGuid(HIGHGUID_PLAYER, entry->owner);
draft.SendMailTo(MailReceiver(receiverGuid), MailSender(MAIL_NORMAL, bidder));
Expand All @@ -1144,11 +1144,11 @@ void AhBot::Dump()
Category* category = CategoryList::instance[i];
if (category->Contains(proto))
{
vector<uint32> items = availableItems.Get(category);
std::vector<uint32> items = availableItems.Get(category);
if (find(items.begin(), items.end(), proto->ItemId) == items.end())
continue;

ostringstream out;
std::ostringstream out;
if (first)
{
out << proto->ItemId << " (" << proto->Name1 << ") x" << category->GetStackCount(proto) << " - ";
Expand Down Expand Up @@ -1193,12 +1193,12 @@ void AhBot::CleanupPropositions()
}
}

void AhBot::DeleteMail(list<uint32> buffer)
void AhBot::DeleteMail(std::list<uint32> buffer)
{
ostringstream sql;
std::ostringstream sql;
sql << "delete from mail where id in ( ";
bool first = true;
for (list<uint32>::iterator j = buffer.begin(); j != buffer.end(); ++j)
for (std::list<uint32>::iterator j = buffer.begin(); j != buffer.end(); ++j)
{
if (first) first = false; else sql << ",";
sql << "'" << *j << "'";
Expand Down
28 changes: 13 additions & 15 deletions ahbot/AhBot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

namespace ahbot
{
using namespace std;

class AhBot
{
public:
Expand All @@ -38,11 +36,11 @@ namespace ahbot
void Init();
void Update();
void ForceUpdate();
void HandleCommand(string command);
void HandleCommand(std::string command);
void Won(AuctionEntry* entry) { AddToHistory(entry); }
void Expired(AuctionEntry* entry) {}

double GetCategoryMultiplier(string category)
double GetCategoryMultiplier(std::string category)
{
return categoryMultipliers[category] ? categoryMultipliers[category] : 1;
}
Expand All @@ -67,33 +65,33 @@ namespace ahbot
uint32 GetRandomBidder(uint32 auctionHouse);
void LoadRandomBots();
uint32 GetAnswerCount(uint32 itemId, uint32 auctionHouse, uint32 withinTime);
vector<AuctionEntry*> LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, Category*& category,
std::vector<AuctionEntry*> LoadAuctions(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, Category*& category,
int& auction);
void FindMinPrice(const AuctionHouseObject::AuctionEntryMap& auctionEntryMap, AuctionEntry*& entry, Item*& item, uint32* minBid,
uint32* minBuyout);
uint32 GetBuyTime(uint32 entry, uint32 itemId, uint32 auctionHouse, Category*& category, double priceLevel);
uint32 GetTime(string category, uint32 id, uint32 auctionHouse, uint32 type);
void SetTime(string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value);
uint32 GetTime(std::string category, uint32 id, uint32 auctionHouse, uint32 type);
void SetTime(std::string category, uint32 id, uint32 auctionHouse, uint32 type, uint32 value);
uint32 GetSellTime(uint32 itemId, uint32 auctionHouse, Category*& category);
void CheckSendMail(uint32 bidder, uint32 price, AuctionEntry *entry);
void Dump();
void CleanupPropositions();
void DeleteMail(list<uint32> buffer);
void DeleteMail(std::list<uint32> buffer);

public:
static uint32 auctionIds[MAX_AUCTIONS];
static uint32 auctioneers[MAX_AUCTIONS];
static map<uint32, uint32> factions;
static std::map<uint32, uint32> factions;

private:
AvailableItemsBag availableItems;
time_t nextAICheckTime;
map<string, double> categoryMultipliers;
map<string, uint32> categoryMaxAuctionCount;
map<string, uint32> categoryMaxItemAuctionCount;
map<string, uint64> categoryMultiplierExpireTimes;
map<uint32, vector<uint32> > bidders;
set<uint32> allBidders;
std::map<std::string, double> categoryMultipliers;
std::map<std::string, uint32> categoryMaxAuctionCount;
std::map<std::string, uint32> categoryMaxItemAuctionCount;
std::map<std::string, uint64> categoryMultiplierExpireTimes;
std::map<uint32, std::vector<uint32>> bidders;
std::set<uint32> allBidders;
bool updating;
};
};
Expand Down
Loading

0 comments on commit 79e70fa

Please sign in to comment.