Implement CEntityHandle & CEntitySystem (alliedmodders#134)

Add CConcreteEntityList, CEntityComponent, CScriptComponent, CGameEntitySystem, rewrite IHandleEntity to use CEntityHandle instead of CBaseHandle, update NUM_SERIAL_NUM_BITS, comment out old CBaseEntity, obsolete basehandle.h

entity2/entitysystem.cpp

@@ -0,0 +1,40 @@
+#include "const.h"
+#include "entity2/entitysystem.h"
+
+CBaseEntity* CEntitySystem::GetBaseEntity(CEntityIndex entnum)
+{
+	if (entnum.Get() <= -1 || entnum.Get() >= (MAX_TOTAL_ENTITIES - 1))
+		return nullptr;
+
+	CEntityIdentity* pChunkToUse = m_EntityList.m_pIdentityChunks[entnum.Get() / MAX_ENTITIES_IN_LIST];
+	if (!pChunkToUse)
+		return nullptr;
+
+	CEntityIdentity* pIdentity = &pChunkToUse[entnum.Get() % MAX_ENTITIES_IN_LIST];
+	if (!pIdentity)
+		return nullptr;
+
+	if (pIdentity->m_EHandle.GetEntryIndex() != entnum.Get())
+		return nullptr;
+
+	return dynamic_cast<CBaseEntity*>(pIdentity->m_pInstance);
+}
+
+CBaseEntity* CEntitySystem::GetBaseEntity(const CEntityHandle& hEnt)
+{
+	if (!hEnt.IsValid())
+		return nullptr;
+
+	CEntityIdentity* pChunkToUse = m_EntityList.m_pIdentityChunks[hEnt.GetEntryIndex() / MAX_ENTITIES_IN_LIST];
+	if (!pChunkToUse)
+		return nullptr;
+
+	CEntityIdentity* pIdentity = &pChunkToUse[hEnt.GetEntryIndex() % MAX_ENTITIES_IN_LIST];
+	if (!pIdentity)
+		return nullptr;
+
+	if (pIdentity->m_EHandle != hEnt)
+		return nullptr;
+
+	return dynamic_cast<CBaseEntity*>(pIdentity->m_pInstance);
+}

game/client/in_forcefeedback.cpp

@@ -1,10 +1,10 @@
-//====== Copyright © 1996-2004, Valve Corporation, All rights reserved. =======
+//====== Copyright � 1996-2004, Valve Corporation, All rights reserved. =======
 //
 // Purpose: Force feeback OS level handlers
 //
 //=============================================================================
 #include <windows.h>
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "UtlVector.h"
 #include "usercmd.h"
 #include "cdll_client_int.h"

game/client/in_joystick.cpp

@@ -7,7 +7,7 @@
 // $NoKeywords: $
 //===========================================================================//
 #include "cbase.h"
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "utlvector.h"
 #include "cdll_client_int.h"
 #include "cdll_util.h"

game/client/in_mouse.cpp

@@ -15,7 +15,7 @@
 #include "hud.h"
 #include "cdll_int.h"
 #include "kbutton.h"
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "usercmd.h"
 #include "input.h"
 #include "iviewrender.h"

game/client/in_trackir.cpp

@@ -1,4 +1,4 @@
-//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
+//========= Copyright � 1996-2005, Valve Corporation, All rights reserved. ============//
 //
 // Purpose: TrackIR handling function
 //
@@ -21,7 +21,7 @@
 #include "vphysics_interface.h"
 #include <icvar.h>
 #include <baseentity_shared.h>
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "ehandle.h"
 #include "utlvector.h"
 #include "cdll_client_int.h"

game/server/baseentity.h

@@ -11,6 +11,12 @@
 #pragma once
 #endif
 
+#include "entityidentity.h"
+class CBaseEntity : public CEntityInstance
+{
+};
+
+#if 0
 #define TEAMNUM_NUM_BITS	6
 
 #include <ctype.h>
@@ -2906,4 +2912,6 @@ FORCEINLINE bool EntityNamesMatch( const char *pszQuery, string_t nameToMatch )
 	return false;
 }
 
+#endif
+
 #endif // BASEENTITY_H

game/shared/ehandle.h

@@ -1,4 +1,4 @@
-//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
+//========= Copyright � 1996-2005, Valve Corporation, All rights reserved. ============//
 //
 // Purpose: 
 //
@@ -11,36 +11,24 @@
 #pragma once
 #endif
 
-#if defined( _DEBUG ) && defined( GAME_DLL )
-#include "tier0/dbg.h"
-#include "cbase.h"
-#endif
-
-
-#include "const.h"
-#include "basehandle.h"
-#include "entitylist_base.h"
-
-
-class IHandleEntity;
-
+#include "entityhandle.h"
+#include "entity2/entitysystem.h"
 
 // -------------------------------------------------------------------------------------------------- //
 // Game-code CBaseHandle implementation.
 // -------------------------------------------------------------------------------------------------- //
 
-inline IHandleEntity* CBaseHandle::Get() const
+inline IHandleEntity* CEntityHandle::Get() const
 {
-	extern CBaseEntityList *g_pEntityList;
-	return g_pEntityList->LookupEntity( *this );
+	extern CEntitySystem *g_pEntitySystem;
+	return g_pEntitySystem->GetBaseEntity( *this );
 }
 
-
 // -------------------------------------------------------------------------------------------------- //
 // CHandle.
 // -------------------------------------------------------------------------------------------------- //
 template< class T >
-class CHandle : public CBaseHandle
+class CHandle : public CEntityHandle
 {
 public:
 

game/shared/entitylist_base.h

@@ -1,4 +1,4 @@
-//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
+//========= Copyright � 1996-2005, Valve Corporation, All rights reserved. ============//
 //
 // Purpose: 
 //
@@ -12,7 +12,7 @@
 
 
 #include "const.h"
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "tier1/utllinkedlist.h"
 #include "ihandleentity.h"
 

game/shared/sharedvar.h

@@ -1,4 +1,4 @@
-//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
+//========= Copyright � 1996-2005, Valve Corporation, All rights reserved. ============//
 //
 // Purpose: 
 //
@@ -13,7 +13,7 @@
 
 #include "convar.h"
 #include "ispsharedmemory.h"
-#include "basehandle.h"
+#include "entityhandle.h"
 #include "isaverestore.h"