metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

client almost builds

Browse Source
This commit is contained in:
d1str4ught
2025-08-19 00:20:40 +02:00
parent 4be475f111
commit be56f3f31a
1090 changed files with 126610 additions and 14032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/EterGrnLib/CMakeLists.txt
View File

@@ -2,7 +2,8 @@
add_library(EterGrnLib STATIC ${FILE_SOURCES})
# target_link_libraries(EterGrnLib
# )
target_link_libraries(EterGrnLib
lzo2
)
GroupSourcesByFolder(EterGrnLib)

2
src/EterGrnLib/LODController.cpp
View File

@@ -500,7 +500,7 @@ void CGrannyLODController::UpdateLODLevel(float fDistanceFromCenter, float fDist
bLODLevel = 3;
}
bLODLevel = (BYTE) (m_que_pkModelInst.size() - min(bLODLevel, m_que_pkModelInst.size()) - 1);
bLODLevel = (BYTE) (m_que_pkModelInst.size() - std::min((size_t)bLODLevel, m_que_pkModelInst.size()) - 1);
}
if (ms_isMinLODModeEnable)

24
src/EterGrnLib/ModelInstanceCollisionDetection.cpp
View File

@@ -17,19 +17,19 @@ void CGrannyModelInstance::MakeBoundBox(TBoundBox* pBoundBox,
pBoundBox->ey = OBBMax[0] * mat[1] + OBBMax[1] * mat[5] + OBBMax[2] * mat[9] + mat[13];
pBoundBox->ez = OBBMax[0] * mat[2] + OBBMax[1] * mat[6] + OBBMax[2] * mat[10] + mat[14];
vtMin->x = min(vtMin->x, pBoundBox->sx);
vtMin->x = min(vtMin->x, pBoundBox->ex);
vtMin->y = min(vtMin->y, pBoundBox->sy);
vtMin->y = min(vtMin->y, pBoundBox->ey);
vtMin->z = min(vtMin->z, pBoundBox->sz);
vtMin->z = min(vtMin->z, pBoundBox->ez);
vtMin->x = std::min(vtMin->x, pBoundBox->sx);
vtMin->x = std::min(vtMin->x, pBoundBox->ex);
vtMin->y = std::min(vtMin->y, pBoundBox->sy);
vtMin->y = std::min(vtMin->y, pBoundBox->ey);
vtMin->z = std::min(vtMin->z, pBoundBox->sz);
vtMin->z = std::min(vtMin->z, pBoundBox->ez);
vtMax->x = max(vtMax->x, pBoundBox->sx);
vtMax->x = max(vtMax->x, pBoundBox->ex);
vtMax->y = max(vtMax->y, pBoundBox->sy);
vtMax->y = max(vtMax->y, pBoundBox->ey);
vtMax->z = max(vtMax->z, pBoundBox->sz);
vtMax->z = max(vtMax->z, pBoundBox->ez);
vtMax->x = std::max(vtMax->x, pBoundBox->sx);
vtMax->x = std::max(vtMax->x, pBoundBox->ex);
vtMax->y = std::max(vtMax->y, pBoundBox->sy);
vtMax->y = std::max(vtMax->y, pBoundBox->ey);
vtMax->z = std::max(vtMax->z, pBoundBox->sz);
vtMax->z = std::max(vtMax->z, pBoundBox->ez);
}
bool CGrannyModelInstance::Intersect(const D3DXMATRIX * c_pMatrix,

8
src/EterGrnLib/StdAfx.h
View File

@@ -14,10 +14,10 @@
// Armadillo nanomite protection
#ifndef NANOBEGIN
#ifdef __BORLANDC__
#define NANOBEGIN __emit__ (0xEB,0x03,0xD6,0xD7,0x01)
#define NANOEND __emit__ (0xEB,0x03,0xD6,0xD7,0x00)
#define NANOBEGIN
#define NANOEND
#else
#define NANOBEGIN __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD7 __asm _emit 0x01
#define NANOEND __asm _emit 0xEB __asm _emit 0x03 __asm _emit 0xD6 __asm _emit 0xD7 __asm _emit 0x00
#define NANOBEGIN
#define NANOEND
#endif
#endif