metin2/server
4
3
Fork 13
Code Issues 13 Pull Requests 3 Packages Projects Releases Wiki Activity

Removed MIN/MAX/MINMAX functions, upgraded to C++17, code cleanup

Browse Source
This commit is contained in:
Exynox
2022-11-27 22:18:08 +02:00
parent 3a74dac29e
commit 148223340c
56 changed files with 230 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/src/Cache.cpp
View File

@ -22,7 +22,7 @@ const int auctionMinFlushSec = 1800;
CItemCache::CItemCache()
{
m_expireTime = MIN(1800, g_iItemCacheFlushSeconds);
m_expireTime = std::min(1800, g_iItemCacheFlushSeconds);
}
CItemCache::~CItemCache()
@ -158,7 +158,7 @@ void CItemCache::OnFlush()
//
CPlayerTableCache::CPlayerTableCache()
{
m_expireTime = MIN(1800, g_iPlayerCacheFlushSeconds);
m_expireTime = std::min(1800, g_iPlayerCacheFlushSeconds);
}
CPlayerTableCache::~CPlayerTableCache()
@ -184,7 +184,7 @@ const int CItemPriceListTableCache::s_nMinFlushSec = 1800;
CItemPriceListTableCache::CItemPriceListTableCache()
{
m_expireTime = MIN(s_nMinFlushSec, g_iItemPriceListTableCacheFlushSeconds);
m_expireTime = std::min(s_nMinFlushSec, g_iItemPriceListTableCacheFlushSeconds);
}
void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList)

10
db/src/ClientManager.cpp
View File

@ -702,7 +702,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
if (pSet && !m_vec_itemTable.empty())
{
CGrid grid(5, MAX(1, pi->pSafebox->bSize) * 9);
CGrid grid(5, std::max<int>(1, pi->pSafebox->bSize) * 9);
bool bEscape = false;
for (DWORD i = 0; i < s_items.size(); ++i)
@ -1624,7 +1624,7 @@ void CClientManager::UpdatePlayerCache()
void CClientManager::SetCacheFlushCountLimit(int iLimit)
{
m_iCacheFlushCountLimit = MAX(10, iLimit);
m_iCacheFlushCountLimit = std::max(10, iLimit);
sys_log(0, "CACHE_FLUSH_LIMIT_PER_SECOND: %d", m_iCacheFlushCountLimit);
}
@ -3065,8 +3065,8 @@ int CClientManager::Process()
//30<33>и<EFBFBD><D0B8><EFBFBD> <20><><EFBFBD><EFBFBD>
if (((thecore_pulse() % (60 * 30 * 10)) == 0))
{
g_iPlayerCacheFlushSeconds = MAX(60, rand() % 180);
g_iItemCacheFlushSeconds = MAX(60, rand() % 180);
g_iPlayerCacheFlushSeconds = std::max(60, rand() % 180);
g_iItemCacheFlushSeconds = std::max(60, rand() % 180);
sys_log(0, "[SAVE_TIME]Change saving time item %d player %d", g_iPlayerCacheFlushSeconds, g_iItemCacheFlushSeconds);
}
*/
@ -3130,7 +3130,7 @@ int CClientManager::Process()
DWORD dwCount = CClientManager::instance().GetUserCount();
g_dwUsageAvg += dwCount;
g_dwUsageMax = MAX(g_dwUsageMax, dwCount);
g_dwUsageMax = std::max(g_dwUsageMax, dwCount);
memset(&thecore_profiler[0], 0, sizeof(thecore_profiler));

6
db/src/ClientManagerBoot.cpp
View File

@ -1178,7 +1178,7 @@ void parse_pair_number_string(const char * c_pszString, std::vector<std::pair<in
{
if (isdigit(*t))
{
strncpy(szNum, t, MIN(sizeof(szNum), (p-t)+1));
strncpy(szNum, t, std::min<size_t>(sizeof(szNum), (p-t)+1));
comma = strchr(szNum, ',');
@ -1236,7 +1236,7 @@ bool CClientManager::InitializeObjectProto()
m_vec_kObjectProto.clear();
}
m_vec_kObjectProto.reserve(MAX(0, pRes->uiNumRows));
m_vec_kObjectProto.reserve(std::max<size_t>(0, pRes->uiNumRows));
MYSQL_ROW data;
@ -1277,7 +1277,7 @@ bool CClientManager::InitializeObjectProto()
str_to_number(t.dwDependOnGroupVnum, data[col++]);
t.lNPCX = 0;
t.lNPCY = MAX(t.lRegion[1], t.lRegion[3])+300;
t.lNPCY = std::max(t.lRegion[1], t.lRegion[3])+300;
// END_OF_ADD_BUILDING_NPC
sys_log(0, "OBJ_PROTO: vnum %lu price %lu mat %lu %lu",

10
db/src/ClientManagerPlayer.cpp
View File

@ -531,11 +531,11 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab)
int max_point = pkTab->level - 9;
int skill_point =
MIN(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP <09><><EFBFBD>ַ<EFBFBD>
MIN(20, pkTab->skills[124].bLevel) + // SKILL_MINING ä<><C3A4>
MIN(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON <09><><EFBFBD><EFBFBD>ȯ
MIN(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP<48><50><EFBFBD><EFBFBD>
MIN(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::min<int>(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP <09><><EFBFBD>ַ<EFBFBD>
std::min<int>(20, pkTab->skills[124].bLevel) + // SKILL_MINING ä<><C3A4>
std::min<int>(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON <09><><EFBFBD><EFBFBD>ȯ
std::min<int>(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP<48><50><EFBFBD><EFBFBD>
std::min<int>(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
pkTab->sub_skill_point = max_point - skill_point;
}

6
db/src/GuildManager.cpp
View File

@ -211,7 +211,7 @@ int CGuildManager::GetRanking(DWORD dwGID)
if (it == map_kLadderPointRankingByGID.end())
return GUILD_RANK_MAX_NUM;
return MINMAX(0, it->second, GUILD_RANK_MAX_NUM);
return std::clamp(it->second, 0, GUILD_RANK_MAX_NUM);
}
void CGuildManager::ResultRanking(MYSQL_RES * pRes)
@ -1013,7 +1013,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
// <20>Ŀ<EFBFBD> <20><><EFBFBD><EFBFBD>
TGuild & k1 = TouchGuild(GID1);
lvp = c_aiScoreByLevel[MIN(GUILD_MAX_LEVEL, k1.level)];
lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k1.level)];
rkp = c_aiScoreByRanking[GetRanking(GID1)];
alv = GetAverageGuildMemberLevel(GID1);
mc = GetGuildMemberCount(GID1);
@ -1029,7 +1029,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
// <20>Ŀ<EFBFBD> <20><><EFBFBD><EFBFBD>
TGuild & k2 = TouchGuild(GID2);
lvp = c_aiScoreByLevel[MIN(GUILD_MAX_LEVEL, k2.level)];
lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k2.level)];
rkp = c_aiScoreByRanking[GetRanking(GID2)];
alv = GetAverageGuildMemberLevel(GID2);
mc = GetGuildMemberCount(GID2);

2
db/src/Main.cpp
View File

@ -169,7 +169,7 @@ int Start()
if (CConfig::instance().GetValue("LOG_KEEP_DAYS", &tmpValue))
{
tmpValue = MINMAX(3, tmpValue, 30);
tmpValue = std::clamp(tmpValue, 3, 30);
log_set_expiration_days(tmpValue);
fprintf(stderr, "Setting log keeping days to %d\n", tmpValue);
}

2
db/src/grid.cpp
View File

@ -12,7 +12,7 @@ CGrid::CGrid(int w, int h) : m_iWidth(w), m_iHeight(h)
CGrid::CGrid(CGrid * pkGrid, int w, int h) : m_iWidth(w), m_iHeight(h)
{
m_pGrid = new char[m_iWidth * m_iHeight];
int iSize = std::MIN(w * h, pkGrid->m_iWidth * pkGrid->m_iHeight);
int iSize = std::min(w * h, pkGrid->m_iWidth * pkGrid->m_iHeight);
memcpy(m_pGrid, pkGrid->m_pGrid, sizeof(char) * iSize);
}