R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in hitbox drawing code and light restructure

Browse Source 
* Fix null pointer dereference crash in server hitbox drawing code; implemented a proper getter for CStudioHdr.
* Moved 'baseentity.h/cpp' to 'game/server/' instead.
* Overall light cleanup.
This commit is contained in:
Kawe Mazidjatari 2023-01-23 23:21:29 +01:00
parent d97678e059
commit 66ef9fb6a0
17 changed files with 146 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
r5dev/game/server/baseanimating.cpp
View File

@ -8,7 +8,7 @@
#include "engine/modelinfo.h"
#include "public/idebugoverlay.h"
static Vector3D hullcolor[8] =
static const Vector3D s_HullColor[8] =
{
Vector3D(1.0, 1.0, 1.0),
Vector3D(1.0, 0.5, 0.5),
@ -27,17 +27,12 @@ static Vector3D hullcolor[8] =
//-----------------------------------------------------------------------------
void CBaseAnimating::DrawServerHitboxes(float duration /*= 0.0f*/)
{
if (!m_pStudioHdr && g_pModelInfoServer->GetModel(m_nModelIndex))
{
UpdateModelPtr();
if (!m_pStudioHdr)
{
return;
}
}
CStudioHdr* pStudioHdr = GetModelPtr();
if (!GetModelPtr())
return;
mstudiohitboxset_t* set = m_pStudioHdr->pHitboxSet(m_nHitboxSet);
if (!set)
mstudiohitboxset_t* pSet = pStudioHdr->GetHitboxSet(m_nHitboxSet);
if (!pSet)
return;
matrix3x4_t transforms;
@ -46,15 +41,15 @@ void CBaseAnimating::DrawServerHitboxes(float duration /*= 0.0f*/)
int g = 0;
int b = 255;
for (int i = 0; i < set->numhitboxes; i++)
for (int i = 0; i < pSet->numhitboxes; i++)
{
mstudiobbox_t* pBox = set->pHitbox(i);
mstudiobbox_t* pBox = pSet->pHitbox(i);
int j = (pBox->group % 8);
r = (int)(255.0f * hullcolor[j][0]);
g = (int)(255.0f * hullcolor[j][1]);
b = (int)(255.0f * hullcolor[j][2]);
r = static_cast<int>(255.0f * s_HullColor[j][0]);
g = static_cast<int>(255.0f * s_HullColor[j][1]);
b = static_cast<int>(255.0f * s_HullColor[j][2]);
HitboxToWorldTransforms(pBox->bone, &transforms);
g_pDebugOverlay->AddBoxOverlay(transforms, pBox->bbmin, pBox->bbmax, r, g, b, 0, true, duration);
@ -63,17 +58,26 @@ void CBaseAnimating::DrawServerHitboxes(float duration /*= 0.0f*/)
void CBaseAnimating::HitboxToWorldTransforms(uint32_t iBone, matrix3x4_t* transforms)
{
const static int index = 285;
constexpr int index = 285;
CallVFunc<void>(index, this, iBone, transforms);
}
//-----------------------------------------------------------------------------
// Purpose: sets studio pointer to an updated studiomdl cache
//-----------------------------------------------------------------------------
void CBaseAnimating::UpdateModelPtr()
void CBaseAnimating::LockStudioHdr()
{
// Populates the 'm_pStudioHdr' field.
v_CBaseAnimating__UpdateModelPtr(this);
v_CBaseAnimating__LockStudioHdr(this);
}
CStudioHdr* CBaseAnimating::GetModelPtr(void)
{
if (!m_pStudioHdr && GetModel())
{
LockStudioHdr();
}
return (m_pStudioHdr && m_pStudioHdr->IsValid()) ? m_pStudioHdr : nullptr;
}
void DrawServerHitboxes(CBaseAnimating* thisp, float duration)

17
r5dev/game/server/baseanimating.h
View File

@ -9,19 +9,20 @@
#ifdef _WIN32
#pragma once
#endif
#include "public/baseentity.h"
#include "game/shared/animation.h"
#include "baseentity.h"
#include "public/studio.h"
#include "game/shared/animation.h"
class CBaseAnimating : public CBaseEntity
{
public:
void DrawServerHitboxes(float duration = 0.0f);
void UpdateModelPtr();
void LockStudioHdr(void);
void HitboxToWorldTransforms(uint32_t iBone, matrix3x4_t* transforms);
CStudioHdr* GetModelPtr(void);
float GetModelScale() const { return m_flModelScale; }
protected:
@ -135,8 +136,8 @@ protected:
char gap_11E4[12]; // TODO: this might belong to CBaseAnimatingOverlay!
};
inline CMemory p_CBaseAnimating__UpdateModelPtr;
inline auto v_CBaseAnimating__UpdateModelPtr = p_CBaseAnimating__UpdateModelPtr.RCast<CBaseAnimating* (*)(CBaseAnimating* thisp)>();
inline CMemory p_CBaseAnimating__LockStudioHdr;
inline auto v_CBaseAnimating__LockStudioHdr = p_CBaseAnimating__LockStudioHdr.RCast<CBaseAnimating* (*)(CBaseAnimating* thisp)>();
inline CMemory p_CBaseAnimating__DrawServerHitboxes;
inline auto v_CBaseAnimating__DrawServerHitboxes = p_CBaseAnimating__DrawServerHitboxes.RCast<void (*)(CBaseAnimating* thisp, float duration)>();
@ -149,14 +150,14 @@ class VBaseAnimating : public IDetour
{
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CBaseAnimating::UpdateModelPtr : {:#18x} |\n", p_CBaseAnimating__UpdateModelPtr.GetPtr());
spdlog::debug("| FUN: CBaseAnimating::LockStudioHdr : {:#18x} |\n", p_CBaseAnimating__LockStudioHdr.GetPtr());
spdlog::debug("| FUN: CBaseAnimating::DrawServerHitboxes : {:#18x} |\n", p_CBaseAnimating__DrawServerHitboxes.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
p_CBaseAnimating__UpdateModelPtr = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 48 89 74 24 ?? 41 56 48 83 EC 20 0F BF 41 58");
v_CBaseAnimating__UpdateModelPtr = p_CBaseAnimating__UpdateModelPtr.RCast<CBaseAnimating* (*)(CBaseAnimating* thisp)>();
p_CBaseAnimating__LockStudioHdr = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 48 89 74 24 ?? 41 56 48 83 EC 20 0F BF 41 58");
v_CBaseAnimating__LockStudioHdr = p_CBaseAnimating__LockStudioHdr.RCast<CBaseAnimating* (*)(CBaseAnimating* thisp)>();
p_CBaseAnimating__DrawServerHitboxes = g_GameDll.FindPatternSIMD("41 57 48 81 EC ?? ?? ?? ?? 48 83 B9 ?? ?? ?? ?? ?? 4C 8B F9"); // !FIXME NOT COMPAT WITH S0~S2!
v_CBaseAnimating__DrawServerHitboxes = p_CBaseAnimating__DrawServerHitboxes.RCast<void (*)(CBaseAnimating* thisp, float duration)>();

20
r5dev/public/baseentity.cpp → r5dev/game/server/baseentity.cpp
View File

@ -5,6 +5,8 @@
//===============================================================================
#include "core/stdafx.h"
#include "baseentity.h"
#include "engine/gl_model_private.h"
#include "engine/modelinfo.h"
//-----------------------------------------------------------------------------
//
@ -37,3 +39,21 @@ const CServerNetworkProperty* CBaseEntity::NetworkProp() const
{
return &m_Network;
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
model_t* CBaseEntity::GetModel(void)
{
return (model_t*)g_pModelInfoServer->GetModel(GetModelIndex());
}
inline string_t CBaseEntity::GetModelName(void) const
{
return m_ModelName;
}
inline int CBaseEntity::GetModelIndex(void) const
{
return m_nModelIndex;
}

19
r5dev/public/baseentity.h → r5dev/game/server/baseentity.h
View File

@ -12,23 +12,28 @@
#endif
#include "mathlib/vector.h"
#include "game/server/networkproperty.h"
#include "public/iservernetworkable.h"
#include "public/iserverentity.h"
#include "public/string_t.h"
#include "engine/gl_model_private.h"
#include "game/shared/collisionproperty.h"
#include "game/shared/entitylist_base.h"
#include "iservernetworkable.h"
#include "iserverentity.h"
#include "networkproperty.h"
#include "entitylist.h"
class CBaseEntity : public IServerEntity
{
// non-virtual methods. Don't override these!
public:
// An inline version the game code can use
CCollisionProperty* CollisionProp();
const CCollisionProperty* CollisionProp() const;
CServerNetworkProperty* NetworkProp();
const CServerNetworkProperty* NetworkProp() const;
model_t* GetModel(void);
int GetModelIndex(void) const; // Virtual in-engine!
string_t GetModelName(void) const; // Virtual in-engine!
protected:
char m_RefEHandle[4];
char gap_c[4];
@ -40,7 +45,7 @@ protected:
void* m_pfnMoveDone;
void* m_pfnThink;
CServerNetworkProperty m_Network;
const char* m_ModelName;
string_t m_ModelName;
int m_entIndex;
char gap_74[8]; // Aligns properly in IDA and generated code after setting from 4 to 8.
const char* m_iClassname;
@ -251,8 +256,6 @@ protected:
inline CMemory p_CBaseEntity__GetBaseEntity;
inline auto v_CBaseEntity__GetBaseEntity = p_CBaseEntity__GetBaseEntity.RCast<CBaseEntity* (*)(CBaseEntity* thisp)>();
inline CEntInfo* g_pEntityList = nullptr;
///////////////////////////////////////////////////////////////////////////////
class VBaseEntity : public IDetour
{

9
r5dev/game/server/entitylist.cpp Normal file
View File

@ -0,0 +1,9 @@
//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#include "core/stdafx.h"
#include "entitylist.h"
CEntInfo* g_pEntityList = nullptr;

13
r5dev/game/server/entitylist.h Normal file
View File

@ -0,0 +1,13 @@
//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#ifndef ENTITYLIST_H
#define ENTITYLIST_H
#include "game/shared/entitylist_base.h"
extern CEntInfo* g_pEntityList;
#endif // ENTITYLIST_H

2
r5dev/game/server/networkproperty.cpp
View File

@ -6,8 +6,8 @@
//===========================================================================//
#include "core/stdafx.h"
#include "public/baseentity.h"
#include "public/basehandle.h"
#include "baseentity.h"
#include "networkproperty.h"
edict_t CServerNetworkProperty::GetEdict(void) const

9
r5dev/game/server/player.h
View File

@ -7,18 +7,19 @@
#ifndef PLAYER_H
#define PLAYER_H
#include "public/baseentity.h"
#include "baseentity.h"
#include "mathlib/mathlib.h"
#include <public/studio.h>
#include <public/playerstate.h>
#include "mathlib/vector4d.h"
#include "public/studio.h"
#include "public/playerstate.h"
#include "game/shared/animation.h"
#include "game/shared/takedamageinfo.h"
#include "game/shared/usercmd.h"
#include "game/shared/imovehelper.h"
#include "playerlocaldata.h"
#include "basecombatcharacter.h"
#include <mathlib/vector4d.h>
enum PlayerConnectedState
{

4
r5dev/game/shared/animation.h
View File

@ -1,8 +1,8 @@
#ifndef ANIMATION_H
#define ANIMATION_H
#include "mathlib/vector.h"
#include "public/baseentity.h"
#include "public/studio.h"
#include "public/ihandleentity.h"
class CAnimationLayer
{
@ -17,7 +17,7 @@ class CAnimationLayer
int m_nPriority;
float m_flLastEventCheck;
char gap_24[4];
CBaseEntity* m_animationLayerOwner;
IHandleEntity* m_animationLayerOwner; // !TODO: CBaseEntity/C_BaseEntity?
};
struct __declspec(align(8)) PredictedAnimEventData

2
r5dev/game/shared/collisionproperty.h
View File

@ -9,8 +9,8 @@
#define COLLISIONPROPERTY_H
#include "public/engine/ICollideable.h"
#include "public/baseentity.h"
#include "mathlib/vector.h"
#include "baseentity.h"
class CCollisionProperty : public ICollideable
{

6
r5dev/game/shared/imovehelper.h
View File

@ -13,7 +13,7 @@
#endif
#include "tier0/annotations.h"
#include "public/baseentity.h"
#include "public/ihandleentity.h"
typedef CBaseHandle EntityHandle_t;
class IPhysicsSurfaceProps; // !TODO: reverse vtable.
@ -32,8 +32,8 @@ public:
virtual char const* GetName(EntityHandle_t handle) const = 0;
// sets the entity being moved
virtual void SetHost(CBaseEntity* host) = 0;
virtual CBaseEntity* GetHost(void) = 0;
virtual void SetHost(IHandleEntity* host) = 0;
virtual IHandleEntity* GetHost(void) = 0;
virtual void ResetTouchList(void) = 0;
virtual bool AddToTouched(const /*CGameTrace&*/void* tr, const Vector3D& impactvelocity) = 0;

5
r5dev/game/shared/predictioncopy.h
View File

@ -12,13 +12,16 @@
#endif
#include "ehandle.h"
#include "public/baseentity.h"
#if defined( CLIENT_DLL )
#include "game/client/c_baseentity.h"
class C_BaseEntity;
typedef CHandle<C_BaseEntity> EHANDLE;
#else
#include "game/server/baseentity.h"
class CBaseEntity;
typedef CHandle<CBaseEntity> EHANDLE;
#endif

17
r5dev/public/studio.h
View File

@ -339,7 +339,7 @@ struct studiohdr_t
// Look up hitbox set by index
mstudiohitboxset_t* pHitboxSet(int i) const
mstudiohitboxset_t* GetHitboxSet(int i) const
{
Assert(i >= 0 && i < numhitboxsets);
return (mstudiohitboxset_t*)(((byte*)this) + hitboxsetindex) + i;
@ -1033,13 +1033,22 @@ struct studiohwdata_t
class CStudioHdr
{
public:
public: // Detour statics:
static int LookupSequence(CStudioHdr* pStudio, const char* pszName);
inline mstudiohitboxset_t* pHitboxSet(int i) const { return m_pStudioHdr->pHitboxSet(i); };
public:
inline bool IsVirtual(void) { return (m_pVModel != NULL); };
inline bool IsValid(void) { return (m_pStudioHdr != NULL); };
inline bool IsReadyForAccess(void) const { return (m_pStudioHdr != NULL); };
public:
inline const studiohdr_t* GetRenderHdr(void) const { return m_pStudioHdr; };
inline mstudiohitboxset_t* GetHitboxSet(int i) const { return m_pStudioHdr->GetHitboxSet(i); };
private:
void* vtbl;
studiohdr_t* m_pStudioHdr;
void* m_pVModel;
void* m_pVModel; // !TODO: 'virtualmodel_t'.
char gap0[156];
mstudiobbox_t m_pHitBox;
char gap_10[1896];

6
r5dev/vproj/dedicated.vcxproj
View File

@ -183,7 +183,9 @@
<ClInclude Include="..\game\server\baseanimatingoverlay.h" />
<ClInclude Include="..\game\server\baseanimating.h" />
<ClInclude Include="..\game\server\basecombatcharacter.h" />
<ClInclude Include="..\game\server\baseentity.h" />
<ClInclude Include="..\game\server\detour_impl.h" />
<ClInclude Include="..\game\server\entitylist.h" />
<ClInclude Include="..\game\server\fairfight_impl.h" />
<ClInclude Include="..\game\server\gameinterface.h" />
<ClInclude Include="..\game\server\movehelper_server.h" />
@ -238,7 +240,6 @@
<ClInclude Include="..\protoc\cl_rcon.pb.h" />
<ClInclude Include="..\protoc\sig_map.pb.h" />
<ClInclude Include="..\protoc\sv_rcon.pb.h" />
<ClInclude Include="..\public\baseentity.h" />
<ClInclude Include="..\public\basehandle.h" />
<ClInclude Include="..\public\bspflags.h" />
<ClInclude Include="..\public\cmodel.h" />
@ -564,6 +565,8 @@
<ClCompile Include="..\game\server\ai_networkmanager.cpp" />
<ClCompile Include="..\game\server\ai_utility.cpp" />
<ClCompile Include="..\game\server\baseanimating.cpp" />
<ClCompile Include="..\game\server\baseentity.cpp" />
<ClCompile Include="..\game\server\entitylist.cpp" />
<ClCompile Include="..\game\server\gameinterface.cpp" />
<ClCompile Include="..\game\server\movehelper_server.cpp" />
<ClCompile Include="..\game\server\networkproperty.cpp" />
@ -608,7 +611,6 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp" />
<ClCompile Include="..\public\datamap.cpp" />
<ClCompile Include="..\public\networkvar.cpp" />
<ClCompile Include="..\public\utility\binstream.cpp" />

18
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -1311,9 +1311,6 @@
<ClInclude Include="..\public\string_t.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\public\baseentity.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\public\engine\ICollideable.h">
<Filter>sdk\public\engine</Filter>
</ClInclude>
@ -1398,6 +1395,12 @@
<ClInclude Include="..\engine\modelinfo.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\game\server\entitylist.h">
<Filter>sdk\game\server</Filter>
</ClInclude>
<ClInclude Include="..\game\server\baseentity.h">
<Filter>sdk\game\server</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\common\opcodes.cpp">
@ -1751,9 +1754,6 @@
<ClCompile Include="..\game\server\player.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp">
<Filter>sdk\public</Filter>
</ClCompile>
<ClCompile Include="..\game\server\movehelper_server.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
@ -1769,6 +1769,12 @@
<ClCompile Include="..\engine\modelinfo.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="..\game\server\entitylist.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\game\server\baseentity.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\Dedicated.def" />

6
r5dev/vproj/gamesdk.vcxproj
View File

@ -71,6 +71,8 @@
<ClCompile Include="..\game\server\ai_networkmanager.cpp" />
<ClCompile Include="..\game\server\ai_utility.cpp" />
<ClCompile Include="..\game\server\baseanimating.cpp" />
<ClCompile Include="..\game\server\baseentity.cpp" />
<ClCompile Include="..\game\server\entitylist.cpp" />
<ClCompile Include="..\game\server\gameinterface.cpp" />
<ClCompile Include="..\game\server\movehelper_server.cpp" />
<ClCompile Include="..\game\server\networkproperty.cpp" />
@ -118,7 +120,6 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp" />
<ClCompile Include="..\public\datamap.cpp" />
<ClCompile Include="..\public\dt_recv.cpp" />
<ClCompile Include="..\public\networkvar.cpp" />
@ -266,7 +267,9 @@
<ClInclude Include="..\game\server\baseanimatingoverlay.h" />
<ClInclude Include="..\game\server\baseanimating.h" />
<ClInclude Include="..\game\server\basecombatcharacter.h" />
<ClInclude Include="..\game\server\baseentity.h" />
<ClInclude Include="..\game\server\detour_impl.h" />
<ClInclude Include="..\game\server\entitylist.h" />
<ClInclude Include="..\game\server\fairfight_impl.h" />
<ClInclude Include="..\game\server\gameinterface.h" />
<ClInclude Include="..\game\server\movehelper_server.h" />
@ -330,7 +333,6 @@
<ClInclude Include="..\protoc\sv_rcon.pb.h" />
<ClInclude Include="..\public\avi\iavi.h" />
<ClInclude Include="..\public\avi\ibik.h" />
<ClInclude Include="..\public\baseentity.h" />
<ClInclude Include="..\public\basehandle.h" />
<ClInclude Include="..\public\bitmap\stb_image.h" />
<ClInclude Include="..\public\bspflags.h" />

18
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -708,9 +708,6 @@
<ClCompile Include="..\game\server\player.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp">
<Filter>sdk\public</Filter>
</ClCompile>
<ClCompile Include="..\game\server\movehelper_server.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
@ -729,6 +726,12 @@
<ClCompile Include="..\engine\modelinfo.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="..\game\server\entitylist.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\game\server\baseentity.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -2039,9 +2042,6 @@
<ClInclude Include="..\public\string_t.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\public\baseentity.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\game\server\networkproperty.h">
<Filter>sdk\game\server</Filter>
</ClInclude>
@ -2135,6 +2135,12 @@
<ClInclude Include="..\engine\modelinfo.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\game\server\entitylist.h">
<Filter>sdk\game\server</Filter>
</ClInclude>
<ClInclude Include="..\game\server\baseentity.h">
<Filter>sdk\game\server</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">