Rename ISE_Shape -> IServerEntityShape.

OpenXRay · Nov 8, 2015 · c34b27f · c34b27f
1 parent eb9ac7a
commit c34b27f
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/src/editors/LevelEditor/Edit/ESceneObjectToolsExportBreakable.cpp b/src/editors/LevelEditor/Edit/ESceneObjectToolsExportBreakable.cpp
@@ -256,7 +256,7 @@ bool ESceneObjectTool::ExportClimableObjects(SExportStreams* F)
                 {
                     AnsiString entity_ref       = "climable_object";
                     IServerEntity*  m_Data      = create_entity(entity_ref.c_str());    VERIFY(m_Data);
-                    ISE_Shape* m_Shape          = m_Data->shape();                      VERIFY(m_Shape);
+                    IServerEntityShape* m_Shape          = m_Data->shape();                      VERIFY(m_Shape);
 //                  CSE_Visual* m_Visual        = m_Data->visual(); VERIFY(m_Visual);
                     // set params
                     m_Data->set_name            (entity_ref.c_str());

diff --git a/src/editors/LevelEditor/Edit/SpawnPoint.cpp b/src/editors/LevelEditor/Edit/SpawnPoint.cpp
@@ -367,7 +367,7 @@ bool CSpawnPoint::SSpawnData::ExportGame(SExportStreams* F, CSpawnPoint* owner)
     m_Data->angle().set         (owner->PRotation);
 
     // export cform (if needed)
-    ISE_Shape* cform            = m_Data->shape();
+    IServerEntityShape* cform            = m_Data->shape();
 // SHAPE
     if (cform&&!(owner->m_AttachedObject&&(owner->m_AttachedObject->ClassID==OBJCLASS_SHAPE))){
         ELog.DlgMsg             (mtError,"Spawn Point: '%s' must contain attached shape.",owner->Name);

diff --git a/src/xrServerEntities/smart_cast.h b/src/xrServerEntities/smart_cast.h
@@ -264,9 +264,9 @@
 #	undef cast_type_list
 #	define cast_type_list save_cast_list	(CSE_Motion,	CSE_Abstract)
 
-	DECLARE_SPECIALIZATION	(ISE_Shape,		CSE_Abstract,	shape);
+	DECLARE_SPECIALIZATION	(IServerEntityShape,		CSE_Abstract,	shape);
 #	undef cast_type_list
-#	define cast_type_list save_cast_list	(ISE_Shape,		CSE_Abstract)
+#	define cast_type_list save_cast_list	(IServerEntityShape,		CSE_Abstract)
 
 	DECLARE_SPECIALIZATION	(CSE_Abstract,	CSE_PHSkeleton,	cast_abstract);
 #	undef cast_type_list

diff --git a/src/xrServerEntities/xrServer_Object_Base.cpp b/src/xrServerEntities/xrServer_Object_Base.cpp
@@ -166,7 +166,7 @@ CSE_Visual* CSE_Abstract::visual			()
 	return						(0);
 }
 
-ISE_Shape*  CSE_Abstract::shape				()
+IServerEntityShape*  CSE_Abstract::shape				()
 {
 	return						(0);
 }

diff --git a/src/xrServerEntities/xrServer_Object_Base.h b/src/xrServerEntities/xrServer_Object_Base.h
@@ -138,7 +138,7 @@ class CSE_Abstract :
     virtual Fvector&    __stdcall   angle                   ();
     virtual Flags16&    __stdcall   flags                   ();
     virtual CSE_Visual* __stdcall   visual                  ();
-    virtual ISE_Shape*  __stdcall   shape                   ();
+    virtual IServerEntityShape*  __stdcall   shape                   ();
     virtual CSE_Motion* __stdcall   motion                  ();
     virtual bool        __stdcall   validate                ();
     //

diff --git a/src/xrServerEntities/xrServer_Objects.h b/src/xrServerEntities/xrServer_Objects.h
@@ -166,17 +166,17 @@
 #define SPAWN_VERSION	u16(128)
 
 class CSE_Shape :
-    public ISE_Shape,
+    public IServerEntityShape,
     public CShapeData
 {
-    using inherited1 = ISE_Shape;
+    using inherited1 = IServerEntityShape;
     using inherited2 = CShapeData;
 public:
 	void							cform_read		(NET_Packet& P);
 	void							cform_write		(NET_Packet& P);
 									CSE_Shape		();
 	virtual							~CSE_Shape		();
-	virtual ISE_Shape*  __stdcall	shape			() = 0;
+	virtual IServerEntityShape*  __stdcall	shape			() = 0;
 	virtual void __stdcall			assign_shapes	(CShapeData::shape_def* shapes, u32 cnt);
 };
 

diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp
@@ -837,7 +837,7 @@ bool CSE_ALifeSpaceRestrictor::used_ai_locations	() const
 	return						(false);
 }
 
-ISE_Shape* CSE_ALifeSpaceRestrictor::shape		()
+IServerEntityShape* CSE_ALifeSpaceRestrictor::shape		()
 {
 	return						(this);
 }
@@ -1960,7 +1960,7 @@ CSE_ALifeObjectClimable::~CSE_ALifeObjectClimable	()
 {
 }
 
-ISE_Shape* CSE_ALifeObjectClimable::shape					()
+IServerEntityShape* CSE_ALifeObjectClimable::shape					()
 {
 	return						(this);
 }

diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h
@@ -402,7 +402,7 @@ class CSE_ALifeSpaceRestrictor :
 
 									CSE_ALifeSpaceRestrictor	(LPCSTR caSection);
 	virtual							~CSE_ALifeSpaceRestrictor	();
-	virtual ISE_Shape*  __stdcall	shape						();
+	virtual IServerEntityShape*  __stdcall	shape						();
 	virtual bool					can_switch_offline			() const;
 	virtual bool					used_ai_locations			() const;
     virtual void UPDATE_Read(NET_Packet& P);
@@ -701,7 +701,7 @@ shared_str						material;
 virtual							~CSE_ALifeObjectClimable	();
 virtual bool					used_ai_locations	() const;
 virtual bool					can_switch_offline	() const;
-virtual ISE_Shape*  __stdcall	shape				();
+virtual IServerEntityShape*  __stdcall	shape				();
 
 #ifndef XRGAME_EXPORTS
 virtual	void		__stdcall	set_additional_info	(void* info);

diff --git a/src/xrServerEntities/xrServer_Objects_Abstract.h b/src/xrServerEntities/xrServer_Objects_Abstract.h
@@ -29,14 +29,14 @@ class CDUInterface;
 #pragma warning(push)
 #pragma warning(disable:4005)
 
-class ISE_Shape
+class IServerEntityShape
 {
 public:
-    virtual ~ISE_Shape() = 0;
+    virtual ~IServerEntityShape() = 0;
     virtual void __stdcall          assign_shapes           (CShapeData::shape_def* shapes, u32 cnt)=0;
 };
 
-IC ISE_Shape::~ISE_Shape() {}
+IC IServerEntityShape::~IServerEntityShape() {}
 
 class CSE_Visual
 {
@@ -140,7 +140,7 @@ class IServerEntity {
     virtual Fvector&    __stdcall   position                () = 0;
     virtual Fvector&    __stdcall   angle                   () = 0;
     virtual Flags16&    __stdcall   flags                   () = 0;
-    virtual ISE_Shape*  __stdcall   shape                   () = 0;
+    virtual IServerEntityShape*  __stdcall   shape                   () = 0;
     virtual CSE_Visual* __stdcall   visual                  () = 0;
     virtual CSE_Motion* __stdcall   motion                  () = 0;
     virtual bool        __stdcall   validate                () = 0;

diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp
@@ -89,7 +89,7 @@ CSE_SmartCover::~CSE_SmartCover ()
 #endif // XRSE_FACTORY_EXPORTS
 }
 
-ISE_Shape* CSE_SmartCover::shape()
+IServerEntityShape* CSE_SmartCover::shape()
 {
     return                      (this);
 }

diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.h
@@ -61,7 +61,7 @@ class CSE_SmartCover :
 public:
     CSE_SmartCover          (LPCSTR caSection);
     virtual                         ~CSE_SmartCover         ();
-    virtual ISE_Shape*  __stdcall   shape                   ();
+    virtual IServerEntityShape*  __stdcall   shape                   ();
     virtual bool                    used_ai_locations       () const;
     virtual bool                    can_save                () const;
     virtual bool                    can_switch_online       () const;