kotofyt/funnygame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some stuff

Browse Source
This commit is contained in:
kotofyt
2026-03-08 21:12:47 +02:00
parent 321a2f31a9
commit 690132996c
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/client/entitysystem.cpp
View File

@@ -161,21 +161,23 @@ void CEntitySystem::Think()
} }
} }
static void *UTIL_GetNetMapData(C_BaseEntity *pEntity, netmap_t *pMap, uint32_t uIndex ) static void *UTIL_GetNetMapData( C_BaseEntity *pEntity, netmap_t *pMap, uint32_t uIndex )
{ {
netmap_t *pCurrentMap = pMap; netmap_t *pCurrentMap = pMap;
uint32_t uCurrentIndex = uIndex; uint32_t uCurrentIndex = uIndex;
searchIndex: searchIndex:
if (uCurrentIndex >= pCurrentMap->m_uFieldCount || pCurrentMap->m_pBase ) if ( pCurrentMap )
{
if (uCurrentIndex >= pCurrentMap->m_uFieldCount)
{ {
uCurrentIndex -= pCurrentMap->m_uFieldCount; uCurrentIndex -= pCurrentMap->m_uFieldCount;
pCurrentMap = pCurrentMap->m_pBase; pCurrentMap = pCurrentMap->m_pBase;
if (!pCurrentMap)
return NULL;
goto searchIndex; goto searchIndex;
} }
return (char*)pEntity+pCurrentMap->m_pFields[uCurrentIndex].m_uOffset; return (char*)pEntity+pCurrentMap->m_pFields[uCurrentIndex].m_uOffset;
}
return NULL;
} }
void CEntitySystem::NetRecvPacket( NetPacket_t *pPacket ) void CEntitySystem::NetRecvPacket( NetPacket_t *pPacket )

1
game/client/worldrender.cpp
View File

@@ -103,7 +103,6 @@ void CFunnyMeshInstance::Frame()
v[2] = m_vScale.z; v[2] = m_vScale.z;
glm_scale_make(m, v); glm_scale_make(m, v);
glm_mat4_mul(m_data.m_matTranslation, m, m_data.m_matTranslation); glm_mat4_mul(m_data.m_matTranslation, m, m_data.m_matTranslation);
glm_mat4_inv(m_data.m_matTranslation, m_data.m_matTranslation);
m_data.m_uAlbedo = 1; m_data.m_uAlbedo = 1;
} }

14
game/server/entitysystem.cpp
View File

@@ -132,20 +132,22 @@ void CEntitySystem::Think( float fDelta )
} }
} }
static void *UTIL_GetNetMapData(CBaseEntity *pEntity, netmap_t *pMap, uint32_t uIndex ) static void *UTIL_GetNetMapData( CBaseEntity *pEntity, netmap_t *pMap, uint32_t uIndex )
{ {
netmap_t *pCurrentMap = pMap; netmap_t *pCurrentMap = pMap;
uint32_t uCurrentIndex = uIndex; uint32_t uCurrentIndex = uIndex;
searchIndex: searchIndex:
if ( uCurrentIndex < pCurrentMap->m_uFieldCount ) if ( pCurrentMap )
{
if (uCurrentIndex >= pCurrentMap->m_uFieldCount)
{ {
return (char*)pEntity+pCurrentMap->m_pFields[uCurrentIndex].m_uOffset;
}
uCurrentIndex -= pCurrentMap->m_uFieldCount; uCurrentIndex -= pCurrentMap->m_uFieldCount;
pCurrentMap = pCurrentMap->m_pBase; pCurrentMap = pCurrentMap->m_pBase;
if (!pCurrentMap)
return NULL;
goto searchIndex; goto searchIndex;
}
return (char*)pEntity+pCurrentMap->m_pFields[uCurrentIndex].m_uOffset;
}
return NULL;
} }

4
materialsystem/vulkan/commands/draw.cpp
View File

@@ -114,9 +114,9 @@ DECLARE_VULKAN_COMMAND(SetViewport)
{ {
VkViewport v = { VkViewport v = {
fX, fX,
fY, fY+fHeight,
fWidth, fWidth,
fHeight, -fHeight,
fDepthMin, fDepthMin,
fDepthMax fDepthMax
}; };