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

Revert "Stop crashing on bad meshes like it's the end of the world"

Browse Source 
This reverts commit b201fd6dd6.
This commit is contained in:
rtw1x1
2025-12-31 09:58:06 +00:00
parent fb4ba5960e
commit 999a0929a6
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/EterGrnLib/Model.cpp
View File

@@ -14,33 +14,16 @@ const CGrannyModel::TMeshNode* CGrannyModel::GetMeshNodeList(CGrannyMesh::EType
CGrannyMesh * CGrannyModel::GetMeshPointer(int iMesh) CGrannyMesh * CGrannyModel::GetMeshPointer(int iMesh)
{ {
if (!CheckMeshIndex(iMesh)) assert(CheckMeshIndex(iMesh));
assert(m_meshs != NULL); assert(m_meshs != NULL);
{
TraceError("CGrannyModel::GetMeshPointer - Invalid mesh index: %d (max: %d)", iMesh, m_meshNodeSize);
return nullptr;
}
if (m_meshs == NULL)
{
TraceError("CGrannyModel::GetMeshPointer - m_meshs is NULL");
return nullptr;
}
return m_meshs + iMesh; return m_meshs + iMesh;
} }
const CGrannyMesh* CGrannyModel::GetMeshPointer(int iMesh) const const CGrannyMesh* CGrannyModel::GetMeshPointer(int iMesh) const
{ {
if (!CheckMeshIndex(iMesh)) assert(CheckMeshIndex(iMesh));
{ assert(m_meshs != NULL);
TraceError("CGrannyModel::GetMeshPointer(const) - Invalid mesh index: %d (max: %d)", iMesh, m_meshNodeSize);
return nullptr;
}
if (m_meshs == NULL)
{
TraceError("CGrannyModel::GetMeshPointer(const) - m_meshs is NULL");
return nullptr;
}
return m_meshs + iMesh; return m_meshs + iMesh;
} }

4
src/EterGrnLib/ModelInstanceCollisionDetection.cpp
View File

@@ -101,10 +101,6 @@ bool CGrannyModelInstance::Intersect(const D3DXMATRIX * c_pMatrix,
granny_matrix_4x4* pgrnMatCompositeBuffer = GrannyGetWorldPoseComposite4x4Array(m_pgrnWorldPose); granny_matrix_4x4* pgrnMatCompositeBuffer = GrannyGetWorldPoseComposite4x4Array(m_pgrnWorldPose);
const CGrannyMesh* c_pMesh = m_pModel->GetMeshPointer(rcurBoundBox.meshIndex); const CGrannyMesh* c_pMesh = m_pModel->GetMeshPointer(rcurBoundBox.meshIndex);
if (!c_pMesh)
continue;
const granny_mesh* c_pgrnMesh = c_pMesh->GetGrannyMeshPointer(); const granny_mesh* c_pgrnMesh = c_pMesh->GetGrannyMeshPointer();
if (!GrannyMeshIsRigid(c_pgrnMesh)) if (!GrannyMeshIsRigid(c_pgrnMesh))

3
src/EterGrnLib/ModelInstanceUpdate.cpp
View File

@@ -177,9 +177,6 @@ void CGrannyModelInstance::UpdateWorldMatrices(const D3DXMATRIX* c_pWorldMatrix)
const CGrannyMesh * pMesh = m_pModel->GetMeshPointer(i); const CGrannyMesh * pMesh = m_pModel->GetMeshPointer(i);
if (!pMesh)
continue;
// WORK // WORK
int * boneIndices = __GetMeshBoneIndices(i); int * boneIndices = __GetMeshBoneIndices(i);
// END_OF_WORK // END_OF_WORK