mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
8339c44c25
Reported by @dr3murr CClientEntityList::GetClientNetworkable() and CClientEntityList::GetClientEntity() lacked a proper clamp on the 'entNum' parameter. CClientEntityList::GetClientEntity() only handled entNum == -1 cases prior to this patch.
94 lines
3.6 KiB
C++
94 lines
3.6 KiB
C++
//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
|
|
//
|
|
// Purpose:
|
|
//
|
|
// $Workfile: $
|
|
// $Date: $
|
|
// $NoKeywords: $
|
|
//===========================================================================//
|
|
#if !defined( CLIENTENTITYLIST_H )
|
|
#define CLIENTENTITYLIST_H
|
|
#include "tier1/utlvector.h"
|
|
#include "tier1/utllinkedlist.h"
|
|
|
|
#include "public/icliententitylist.h"
|
|
|
|
#include "icliententityinternal.h"
|
|
#include "entitylist_clientbase.h"
|
|
#include "c_player.h"
|
|
|
|
// Implement this class and register with entlist to receive entity create/delete notification
|
|
class IClientEntityListener
|
|
{
|
|
public:
|
|
virtual void OnEntityCreated(C_BaseEntity* pEntity) {};
|
|
virtual void OnEntityDeleted(C_BaseEntity* pEntity) {};
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// Purpose: a global list of all the entities in the game. All iteration through
|
|
// entities is done through this object.
|
|
//-----------------------------------------------------------------------------
|
|
class CClientEntityList : public C_BaseEntityList, public IClientEntityList
|
|
{
|
|
protected:
|
|
// Cached info for networked entities.
|
|
struct EntityCacheInfo_t
|
|
{
|
|
// Cached off because GetClientNetworkable is called a *lot*
|
|
IClientNetworkable* m_pNetworkable;
|
|
unsigned short m_BaseEntitiesIndex; // Index into m_BaseEntities (or m_BaseEntities.InvalidIndex() if none).
|
|
unsigned short m_bDormant; // cached dormant state - this is only a bit
|
|
};
|
|
|
|
virtual EntityCacheInfo_t *GetClientNetworkableArray() = 0;
|
|
|
|
private:
|
|
CUtlVector<IClientEntityListener*> m_entityListeners;
|
|
|
|
int m_iNumServerEnts; // Current count
|
|
int m_iMaxServerEnts; // Max allowed
|
|
int m_iNumClientNonNetworkable; // Non networkable count
|
|
int m_iMaxUsedServerIndex; // Current last used slot
|
|
|
|
// This holds fast lookups for special edicts.
|
|
EntityCacheInfo_t m_EntityCacheInfo[NUM_ENT_ENTRIES];
|
|
|
|
// For fast iteration.
|
|
CUtlLinkedList<C_BaseEntity*, unsigned short> m_BaseEntities;
|
|
};
|
|
COMPILE_TIME_ASSERT(sizeof(CClientEntityList) == 0x3800C0);
|
|
|
|
inline IClientNetworkable* (*v_ClientEntityList_GetClientNetworkable)(IClientEntityList* const entList, const int entNum);
|
|
inline IClientEntity* (*v_ClientEntityList_GetClientEntity)(IClientEntityList* const entList, const int entNum);
|
|
|
|
inline IClientEntityList* g_pClientEntityList = nullptr;
|
|
extern CClientEntityList* g_clientEntityList;
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
int HSys_Error_Internal(char* fmt, va_list args);
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
class VClientEntityList : public IDetour
|
|
{
|
|
virtual void GetAdr(void) const
|
|
{
|
|
LogVarAdr("g_clientEntityList", g_clientEntityList);
|
|
}
|
|
virtual void GetFun(void) const
|
|
{
|
|
g_GameDll.FindPatternSIMD("48 63 C2 48 03 C0 48 8B 44 C1").GetPtr(v_ClientEntityList_GetClientNetworkable);
|
|
g_GameDll.FindPatternSIMD("83 FA ?? 7F ?? B8 ?? ?? ?? ?? 2B C2 48 63 D0 48 C1 E2 ?? 48 8B 8C 0A ?? ?? ?? ?? EB ?? 85 D2 78 ?? 48 63 C2 48 C1 E0 ?? 48 8B 8C 08 ?? ?? ?? ?? 48 85 C9 74 ?? 48 8B 01 48 FF 60 ?? 33 C0 C3 CC 80 FA").GetPtr(v_ClientEntityList_GetClientEntity);
|
|
}
|
|
virtual void GetVar(void) const
|
|
{
|
|
g_GameDll.FindPatternSIMD("48 8D 0D ?? ?? ?? ?? 48 8D 05 ?? ?? ?? ?? 44 89 0D").
|
|
ResolveRelativeAddressSelf(3, 7).ResolveRelativeAddressSelf(3, 7).GetPtr(g_clientEntityList);
|
|
}
|
|
virtual void GetCon(void) const { }
|
|
virtual void Detour(const bool bAttach) const;
|
|
};
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#endif // CLIENTENTITYLIST_H
|