DLL_Pure: move data to FactoryObjectBase, introduce interface IFactoryObject.

Author: nitrocaster

src/xrEngine/CustomHUD.h

@@ -18,7 +18,7 @@ class ENGINE_API IRender_Visual;
 class CUI;
 
 class ENGINE_API CCustomHUD :
-    public DLL_Pure,
+    public FactoryObjectBase,
     public IEventReceiver,
     public pureScreenResolutionChanged
 {

src/xrEngine/EngineAPI.h

@@ -9,16 +9,29 @@
 #pragma once
 #include "xrEngine/Engine.h"
 
-// Abstract 'Pure' class for DLL interface
-class ENGINE_API DLL_Pure
+class IFactoryObject
+{
+public:
+    virtual ~IFactoryObject() = 0;
+    virtual CLASS_ID &GetClassId() = 0;
+    virtual IFactoryObject *_construct() = 0;
+};
+
+inline IFactoryObject::~IFactoryObject() {}
+inline IFactoryObject *IFactoryObject::_construct() { return this; }
+
+using DLL_Pure = IFactoryObject;
+
+class ENGINE_API FactoryObjectBase : public IFactoryObject
 {
 public:
     CLASS_ID CLS_ID;
 
-    DLL_Pure(void* params) { CLS_ID = 0; };
-    DLL_Pure() { CLS_ID = 0; };
-    virtual DLL_Pure* _construct() { return this; }
-    virtual ~DLL_Pure() {};
+    FactoryObjectBase(void* params) { CLS_ID = 0; };
+    FactoryObjectBase() { CLS_ID = 0; };
+    virtual CLASS_ID &GetClassId() override { return CLS_ID; }
+    virtual IFactoryObject *_construct() override { return IFactoryObject::_construct(); }
+    virtual ~FactoryObjectBase() {};
 };
 
 // Class creation/destroying interface

src/xrEngine/IGame_Level.h

@@ -40,7 +40,7 @@ class ENGINE_API CServerInfo
 
 //-----------------------------------------------------------------------------------------------------------
 class ENGINE_API IGame_Level :
-    public DLL_Pure,
+    public FactoryObjectBase,
     public IInputReceiver,
     public pureRender,
     public pureFrame,

src/xrEngine/IGame_Persistent.h

@@ -14,7 +14,7 @@ class ENGINE_API CPS_Instance;
 //-----------------------------------------------------------------------------------------------------------
 class ENGINE_API IGame_Persistent :
 #ifndef _EDITOR
-    public DLL_Pure,
+    public FactoryObjectBase,
 #endif
     public pureAppStart,
     public pureAppEnd,

src/xrEngine/xr_object.h

@@ -27,7 +27,7 @@ class IPhysicsShell;
 xr_pure_interface IObjectPhysicsCollision;
 #pragma pack(push,4)
 class ENGINE_API CObject :
-    public DLL_Pure,
+    public FactoryObjectBase,
     public SpatialBase,
     public ScheduledBase,
     public RenderableBase,

src/xrGame/Actor.cpp

@@ -1859,7 +1859,7 @@ CEntityConditionSimple *CActor::create_entity_condition	(CEntityConditionSimple*
 	return		(inherited::create_entity_condition(m_entity_condition));
 }
 
-DLL_Pure *CActor::_construct			()
+IFactoryObject *CActor::_construct			()
 {
 	m_pPhysics_support				=	xr_new<CCharacterPhysicsSupport>(CCharacterPhysicsSupport::etActor,this);
 	CEntityAlive::_construct		();

src/xrGame/Actor.h

@@ -646,7 +646,7 @@ virtual	 void		HideAllWeapons					( bool v ){ SetWeaponHideState(INV_STATE_BLOCK
 
 public:
 	IC		CActorCondition		&conditions					() const;
-	virtual DLL_Pure			*_construct					();
+	virtual IFactoryObject			*_construct					();
 	virtual bool				natural_weapon				() const {return false;}
 	virtual bool				natural_detector			() const {return false;}
 	virtual bool				use_center_to_aim			() const;

src/xrGame/Car.cpp

@@ -1934,7 +1934,7 @@ IC void CCar::fill_doors_map(LPCSTR S,xr_map<u16,SDoor>& doors)
 	}
 }
 
-DLL_Pure *CCar::_construct			()
+IFactoryObject *CCar::_construct			()
 {
 	inherited::_construct		();
 	CScriptEntity::_construct	();

src/xrGame/Car.h

@@ -539,7 +539,7 @@ IC	size_t				CurrentTransmission					(){return m_current_transmission_num;}
 	bool					Use							(const Fvector& pos,const Fvector& dir,const Fvector& foot_pos);
 	u16						DriverAnimationType 		();
 	// Core events
-	virtual DLL_Pure		*_construct					();
+	virtual IFactoryObject		*_construct					();
 	virtual void			Load						( LPCSTR section );
 	virtual BOOL			net_Spawn					( CSE_Abstract* DC );
 	virtual void			net_Destroy					();

src/xrGame/CustomMonster.cpp

@@ -983,7 +983,7 @@ const MonsterSpace::SBoneRotation &CCustomMonster::head_orientation	() const
 	return					(movement().m_body);
 }
 
-DLL_Pure *CCustomMonster::_construct()
+IFactoryObject *CCustomMonster::_construct()
 {
 	m_memory_manager			= create_memory_manager();
 	m_movement_manager			= create_movement_manager();