NycuRO/server
1
0
Fork 0
forked from metin2/server
Code Pull Requests 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

17
game/src/sectree_manager.cpp
View File

@@ -1295,9 +1295,6 @@ bool SECTREE_MANAGER::ForAttrRegionRightAngle( int lMapIndex, int lCX, int lCY,
return mode == ATTR_REGION_MODE_CHECK ? false : true;
}
#define min( l, r ) ((l) < (r) ? (l) : (r))
#define max( l, r ) ((l) < (r) ? (r) : (l))
bool SECTREE_MANAGER::ForAttrRegionFreeAngle( int lMapIndex, int lCX, int lCY, int lCW, int lCH, int lRotate, DWORD dwAttr, EAttrRegionMode mode )
{
float fx1 = (-lCW/2) * sinf(float(lRotate)/180.0f*3.14f) + (-lCH/2) * cosf(float(lRotate)/180.0f*3.14f);
@@ -1330,15 +1327,15 @@ bool SECTREE_MANAGER::ForAttrRegionFreeAngle( int lMapIndex, int lCX, int lCY, i
float fb3 = fy4 - fTilt1*fx4;
float fb4 = fy4 - fTilt2*fx4;
float fxMin = min(fx1, min(fx2, min(fx3, fx4)));
float fxMax = max(fx1, max(fx2, max(fx3, fx4)));
float fxMin = std::min(fx1, std::min(fx2, std::min(fx3, fx4)));
float fxMax = std::max(fx1, std::max(fx2, std::max(fx3, fx4)));
for (int i = int(fxMin); i < int(fxMax); ++i)
{
float fyValue1 = fTilt1*i + min(fb1, fb3);
float fyValue2 = fTilt2*i + min(fb2, fb4);
float fyValue1 = fTilt1*i + std::min(fb1, fb3);
float fyValue2 = fTilt2*i + std::min(fb2, fb4);
float fyValue3 = fTilt1*i + max(fb1, fb3);
float fyValue4 = fTilt2*i + max(fb2, fb4);
float fyValue3 = fTilt1*i + std::max(fb1, fb3);
float fyValue4 = fTilt2*i + std::max(fb2, fb4);
float fMinValue;
float fMaxValue;
@@ -1351,7 +1348,7 @@ bool SECTREE_MANAGER::ForAttrRegionFreeAngle( int lMapIndex, int lCX, int lCY, i
else
fMinValue = fyValue4;
for (int j = int(min(fMinValue, fMaxValue)); j < int(max(fMinValue, fMaxValue)); ++j) {
for (int j = int(std::min(fMinValue, fMaxValue)); j < int(std::max(fMinValue, fMaxValue)); ++j) {
if ( ForAttrRegionCell( lMapIndex, lCX + (lCW / 2) + i, lCY + (lCH / 2) + j, dwAttr, mode ) )
return true;
}