networking

public/baseentity.h

@@ -7,7 +7,11 @@
 
 class CBaseEntity;
 class C_BaseEntity;
-
+enum EPredictionMode {
+	PREDICTION_MODE_CREATED,
+	PREDICTION_MODE_DESTROYED,
+	PREDICTION_MODE_NONE,
+};
 //-----------------------------------------------------------------------------
 // Base server entity class.
 // It is updated every 1/tickrate (64) of a second. Does not require special
@@ -22,6 +26,7 @@ public:
 	virtual void Destroy( void ) = 0;
 	virtual void ReadParameter( const char *szName, const char *szValue );
 	virtual void Think( float fDelta ) = 0;
+	virtual void Sync( void *pData, uint32_t nDataSize ) = 0;
 	void SetPosition( vec3 position );
 	void SetRotationEuler( vec3 euler );
 	void SetRotationQuat( vec4 quaternion );
@@ -32,6 +37,9 @@ public:
 	mat3 m_matrix;
 	vec3 m_position;
 	vec3 m_scale;
+
+	uint64_t m_id;
+	EPredictionMode m_prediction;
 };
 
 
@@ -46,7 +54,7 @@ public:
 	const char *m_szName;
 	const char *m_szClass;
 	EntityRegistryFn m_pfn;
-	ClientEntityRegistryFn m_pClientfn;
+	ClientEntityRegistryFn m_pClientfn = 0;
 };
 
 
@@ -56,7 +64,7 @@ CBaseEntity *__entity_alloc_##name() \
 { \
 	return new class; \
 }; \
-GLOBAL_USED CEntityRegistry __entity_##name##_registry(#name, #class, __entity_alloc_##name); \
+CEntityRegistry __entity_##name##_registry(#name, #class, __entity_alloc_##name); \
 
 
 //-----------------------------------------------------------------------------
@@ -93,7 +101,7 @@ C_BaseEntity *__c_entity_alloc_##server() \
 C_EntityRegistry __c_entity_##server##_registry(#server, __c_entity_alloc_##server); \
 
 
-extern CUtlSelfReferencingVector<CBaseEntity*> g_entities;
+extern CUtlVector<CBaseEntity*> g_entities;
 extern CUtlVector<CEntityRegistry*> g_RegisteredEntities;