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

This commit is contained in:
2022-11-27 22:18:08 +02:00
parent 3a74dac29e
commit 148223340c
56 changed files with 230 additions and 404 deletions

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;
}