Skip to content

Commit c34b27f

Browse files
author
nitrocaster
committed
Rename ISE_Shape -> IServerEntityShape.
1 parent eb9ac7a commit c34b27f

11 files changed

+19
-19
lines changed

src/editors/LevelEditor/Edit/ESceneObjectToolsExportBreakable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ bool ESceneObjectTool::ExportClimableObjects(SExportStreams* F)
256256
{
257257
AnsiString entity_ref = "climable_object";
258258
IServerEntity* m_Data = create_entity(entity_ref.c_str()); VERIFY(m_Data);
259-
ISE_Shape* m_Shape = m_Data->shape(); VERIFY(m_Shape);
259+
IServerEntityShape* m_Shape = m_Data->shape(); VERIFY(m_Shape);
260260
// CSE_Visual* m_Visual = m_Data->visual(); VERIFY(m_Visual);
261261
// set params
262262
m_Data->set_name (entity_ref.c_str());

src/editors/LevelEditor/Edit/SpawnPoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ bool CSpawnPoint::SSpawnData::ExportGame(SExportStreams* F, CSpawnPoint* owner)
367367
m_Data->angle().set (owner->PRotation);
368368

369369
// export cform (if needed)
370-
ISE_Shape* cform = m_Data->shape();
370+
IServerEntityShape* cform = m_Data->shape();
371371
// SHAPE
372372
if (cform&&!(owner->m_AttachedObject&&(owner->m_AttachedObject->ClassID==OBJCLASS_SHAPE))){
373373
ELog.DlgMsg (mtError,"Spawn Point: '%s' must contain attached shape.",owner->Name);

src/xrServerEntities/smart_cast.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@
264264
# undef cast_type_list
265265
# define cast_type_list save_cast_list (CSE_Motion, CSE_Abstract)
266266

267-
DECLARE_SPECIALIZATION (ISE_Shape, CSE_Abstract, shape);
267+
DECLARE_SPECIALIZATION (IServerEntityShape, CSE_Abstract, shape);
268268
# undef cast_type_list
269-
# define cast_type_list save_cast_list (ISE_Shape, CSE_Abstract)
269+
# define cast_type_list save_cast_list (IServerEntityShape, CSE_Abstract)
270270

271271
DECLARE_SPECIALIZATION (CSE_Abstract, CSE_PHSkeleton, cast_abstract);
272272
# undef cast_type_list

src/xrServerEntities/xrServer_Object_Base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ CSE_Visual* CSE_Abstract::visual ()
166166
return (0);
167167
}
168168

169-
ISE_Shape* CSE_Abstract::shape ()
169+
IServerEntityShape* CSE_Abstract::shape ()
170170
{
171171
return (0);
172172
}

src/xrServerEntities/xrServer_Object_Base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class CSE_Abstract :
138138
virtual Fvector& __stdcall angle ();
139139
virtual Flags16& __stdcall flags ();
140140
virtual CSE_Visual* __stdcall visual ();
141-
virtual ISE_Shape* __stdcall shape ();
141+
virtual IServerEntityShape* __stdcall shape ();
142142
virtual CSE_Motion* __stdcall motion ();
143143
virtual bool __stdcall validate ();
144144
//

src/xrServerEntities/xrServer_Objects.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,17 @@
166166
#define SPAWN_VERSION u16(128)
167167

168168
class CSE_Shape :
169-
public ISE_Shape,
169+
public IServerEntityShape,
170170
public CShapeData
171171
{
172-
using inherited1 = ISE_Shape;
172+
using inherited1 = IServerEntityShape;
173173
using inherited2 = CShapeData;
174174
public:
175175
void cform_read (NET_Packet& P);
176176
void cform_write (NET_Packet& P);
177177
CSE_Shape ();
178178
virtual ~CSE_Shape ();
179-
virtual ISE_Shape* __stdcall shape () = 0;
179+
virtual IServerEntityShape* __stdcall shape () = 0;
180180
virtual void __stdcall assign_shapes (CShapeData::shape_def* shapes, u32 cnt);
181181
};
182182

src/xrServerEntities/xrServer_Objects_ALife.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ bool CSE_ALifeSpaceRestrictor::used_ai_locations () const
837837
return (false);
838838
}
839839

840-
ISE_Shape* CSE_ALifeSpaceRestrictor::shape ()
840+
IServerEntityShape* CSE_ALifeSpaceRestrictor::shape ()
841841
{
842842
return (this);
843843
}
@@ -1960,7 +1960,7 @@ CSE_ALifeObjectClimable::~CSE_ALifeObjectClimable ()
19601960
{
19611961
}
19621962

1963-
ISE_Shape* CSE_ALifeObjectClimable::shape ()
1963+
IServerEntityShape* CSE_ALifeObjectClimable::shape ()
19641964
{
19651965
return (this);
19661966
}

src/xrServerEntities/xrServer_Objects_ALife.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class CSE_ALifeSpaceRestrictor :
402402

403403
CSE_ALifeSpaceRestrictor (LPCSTR caSection);
404404
virtual ~CSE_ALifeSpaceRestrictor ();
405-
virtual ISE_Shape* __stdcall shape ();
405+
virtual IServerEntityShape* __stdcall shape ();
406406
virtual bool can_switch_offline () const;
407407
virtual bool used_ai_locations () const;
408408
virtual void UPDATE_Read(NET_Packet& P);
@@ -701,7 +701,7 @@ shared_str material;
701701
virtual ~CSE_ALifeObjectClimable ();
702702
virtual bool used_ai_locations () const;
703703
virtual bool can_switch_offline () const;
704-
virtual ISE_Shape* __stdcall shape ();
704+
virtual IServerEntityShape* __stdcall shape ();
705705

706706
#ifndef XRGAME_EXPORTS
707707
virtual void __stdcall set_additional_info (void* info);

src/xrServerEntities/xrServer_Objects_Abstract.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class CDUInterface;
2929
#pragma warning(push)
3030
#pragma warning(disable:4005)
3131

32-
class ISE_Shape
32+
class IServerEntityShape
3333
{
3434
public:
35-
virtual ~ISE_Shape() = 0;
35+
virtual ~IServerEntityShape() = 0;
3636
virtual void __stdcall assign_shapes (CShapeData::shape_def* shapes, u32 cnt)=0;
3737
};
3838

39-
IC ISE_Shape::~ISE_Shape() {}
39+
IC IServerEntityShape::~IServerEntityShape() {}
4040

4141
class CSE_Visual
4242
{
@@ -140,7 +140,7 @@ class IServerEntity {
140140
virtual Fvector& __stdcall position () = 0;
141141
virtual Fvector& __stdcall angle () = 0;
142142
virtual Flags16& __stdcall flags () = 0;
143-
virtual ISE_Shape* __stdcall shape () = 0;
143+
virtual IServerEntityShape* __stdcall shape () = 0;
144144
virtual CSE_Visual* __stdcall visual () = 0;
145145
virtual CSE_Motion* __stdcall motion () = 0;
146146
virtual bool __stdcall validate () = 0;

src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ CSE_SmartCover::~CSE_SmartCover ()
8989
#endif // XRSE_FACTORY_EXPORTS
9090
}
9191

92-
ISE_Shape* CSE_SmartCover::shape()
92+
IServerEntityShape* CSE_SmartCover::shape()
9393
{
9494
return (this);
9595
}

0 commit comments

Comments
 (0)