forked from metin2/server
Removed Boost dependency, changed MySQL library to MariaDB
This commit is contained in:
@@ -2,29 +2,23 @@
|
||||
#include "../../libgame/include/grid.h"
|
||||
#include "constants.h"
|
||||
#include "utils.h"
|
||||
#include "config.h"
|
||||
#include "shop.h"
|
||||
#include "desc.h"
|
||||
#include "desc_manager.h"
|
||||
#include "char.h"
|
||||
#include "char_manager.h"
|
||||
#include "item.h"
|
||||
#include "item_manager.h"
|
||||
#include "buffer_manager.h"
|
||||
#include "packet.h"
|
||||
#include "log.h"
|
||||
#include "db.h"
|
||||
#include "questmanager.h"
|
||||
#include "monarch.h"
|
||||
#include "mob_manager.h"
|
||||
#include "locale_service.h"
|
||||
#include "desc_client.h"
|
||||
#include "shop_manager.h"
|
||||
#include "group_text_parse_tree.h"
|
||||
#include "shopEx.h"
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include "shop_manager.h"
|
||||
#include <cctype>
|
||||
#include <algorithm>
|
||||
|
||||
CShopManager::CShopManager()
|
||||
{
|
||||
@@ -388,11 +382,11 @@ bool ConvertToShopItemTable(IN CGroupNode* pNode, OUT TShopTableEx& shopTable)
|
||||
stCoinType = "Gold";
|
||||
}
|
||||
|
||||
if (boost::iequals(stCoinType, "Gold"))
|
||||
if (iequals(stCoinType, "Gold"))
|
||||
{
|
||||
shopTable.coinType = SHOP_COIN_TYPE_GOLD;
|
||||
}
|
||||
else if (boost::iequals(stCoinType, "SecondaryCoin"))
|
||||
else if (iequals(stCoinType, "SecondaryCoin"))
|
||||
{
|
||||
shopTable.coinType = SHOP_COIN_TYPE_SECONDARY_COIN;
|
||||
}
|
||||
@@ -442,11 +436,11 @@ bool ConvertToShopItemTable(IN CGroupNode* pNode, OUT TShopTableEx& shopTable)
|
||||
stSort = "None";
|
||||
}
|
||||
|
||||
if (boost::iequals(stSort, "Asc"))
|
||||
if (iequals(stSort, "Asc"))
|
||||
{
|
||||
std::sort(shopItems.begin(), shopItems.end(), CompareShopItemName);
|
||||
}
|
||||
else if(boost::iequals(stSort, "Desc"))
|
||||
else if (iequals(stSort, "Desc"))
|
||||
{
|
||||
std::sort(shopItems.rbegin(), shopItems.rend(), CompareShopItemName);
|
||||
}
|
||||
|
Reference in New Issue
Block a user