TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 21:35:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rest of virtuals removed

Browse source 
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/afx/ce/afxAnimClip.h
View file

@ -61,14 +61,14 @@ public:
/*C*/ afxAnimClipData();
/*C*/ afxAnimClipData(const afxAnimClipData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
virtual bool writeField(StringTableEntry fieldname, const char* value);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool writeField(StringTableEntry fieldname, const char* value) override;
virtual void onStaticModified(const char* slotName, const char* newValue = NULL);
void onStaticModified(const char* slotName, const char* newValue = NULL) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

6
Engine/source/afx/ce/afxAnimLock.h
View file

@ -33,9 +33,9 @@ class afxAnimLockData : public GameBaseData
public:
/*C*/ afxAnimLockData();
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
static void initPersistFields();

8
Engine/source/afx/ce/afxAreaDamage.h
View file

@ -45,11 +45,11 @@ public:
/*C*/ afxAreaDamageData();
/*C*/ afxAreaDamageData(const afxAreaDamageData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

12
Engine/source/afx/ce/afxAudioBank.h
View file

@ -48,15 +48,15 @@ public:
static void initPersistFields();
virtual bool onAdd();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
bool onAdd() override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
afxAudioBank* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
virtual void onPerformSubstitutions();
virtual bool allowSubstitutions() const { return true; }
void onPerformSubstitutions() override;
bool allowSubstitutions() const override { return true; }
DECLARE_CONOBJECT(afxAudioBank);
};

16
Engine/source/afx/ce/afxBillboard.h
View file

@ -62,12 +62,12 @@ public:
/*C*/ afxBillboardData();
/*C*/ afxBillboardData(const afxBillboardData&, bool = false);
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -103,15 +103,15 @@ public:
/*C*/ afxBillboard();
/*D*/ ~afxBillboard();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual bool onAdd();
virtual void onRemove();
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
bool onAdd() override;
void onRemove() override;
void setFadeAmount(F32 amt) { fade_amt = amt; }
void setSortPriority(S8 priority) { sort_priority = priority; }
void setVisibility(bool flag) { is_visible = flag; }
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
void _renderBillboard(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*);

10
Engine/source/afx/ce/afxCameraPuppet.h
View file

@ -40,17 +40,17 @@ public:
U8 networking;
virtual void gather_cons_defs(Vector<afxConstraintDef>& defs);
void gather_cons_defs(Vector<afxConstraintDef>& defs) override;
public:
/*C*/ afxCameraPuppetData();
/*C*/ afxCameraPuppetData(const afxCameraPuppetData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxCameraShake.h
View file

@ -40,11 +40,11 @@ public:
/*C*/ afxCameraShakeData();
/*C*/ afxCameraShakeData(const afxCameraShakeData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

6
Engine/source/afx/ce/afxCollisionEvent.h
View file

@ -43,10 +43,10 @@ public:
/*C*/ afxCollisionEventData();
/*C*/ afxCollisionEventData(const afxCollisionEventData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxConsoleMessage.h
View file

@ -37,11 +37,11 @@ public:
/*C*/ afxConsoleMessageData();
/*C*/ afxConsoleMessageData(const afxConsoleMessageData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxDamage.h
View file

@ -46,11 +46,11 @@ public:
/*C*/ afxDamageData();
/*C*/ afxDamageData(const afxDamageData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

6
Engine/source/afx/ce/afxFootSwitch.h
View file

@ -40,10 +40,10 @@ public:
/*C*/ afxFootSwitchData();
/*C*/ afxFootSwitchData(const afxFootSwitchData&, bool = false);
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxGuiController.h
View file

@ -41,11 +41,11 @@ public:
/*C*/ afxGuiControllerData();
/*C*/ afxGuiControllerData(const afxGuiControllerData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxGuiText.h
View file

@ -40,11 +40,11 @@ public:
/*C*/ afxGuiTextData();
/*C*/ afxGuiTextData(const afxGuiTextData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxLightBase_T3D.h
View file

@ -56,11 +56,11 @@ public:
/*C*/ afxT3DLightBaseData();
/*C*/ afxT3DLightBaseData(const afxT3DLightBaseData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
static void initPersistFields();

8
Engine/source/afx/ce/afxMachineGun.h
View file

@ -42,11 +42,11 @@ public:
/*C*/ afxMachineGunData();
/*C*/ afxMachineGunData(const afxMachineGunData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

22
Engine/source/afx/ce/afxModel.h
View file

@ -85,12 +85,12 @@ public:
/*C*/ afxModelData(const afxModelData&, bool = false);
/*D*/ ~afxModelData();
bool preload(bool server, String &errorStr);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool preload(bool server, String &errorStr) override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
virtual void onPerformSubstitutions();
virtual bool allowSubstitutions() const { return true; }
void onPerformSubstitutions() override;
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -130,22 +130,22 @@ private:
protected:
Vector<S32> mCollisionDetails;
Vector<S32> mLOSDetails;
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
virtual void advanceTime(F32 dt);
void advanceTime(F32 dt) override;
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
void renderObject(SceneRenderState*);
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
public:
/*C*/ afxModel();
/*D*/ ~afxModel();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void setFadeAmount(F32 amt) { fade_amt = amt; }
void setSequenceRateFactor(F32 factor);

24
Engine/source/afx/ce/afxMooring.h
View file

@ -43,11 +43,11 @@ public:
/*C*/ afxMooringData();
/*C*/ afxMooringData(const afxMooringData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -82,15 +82,15 @@ public:
/*C*/ afxMooring(U32 networking, U32 chor_id, StringTableEntry cons_name);
/*D*/ ~afxMooring();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void advanceTime(F32 dt);
virtual bool onAdd();
virtual void onRemove();
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
virtual void setTransform(const MatrixF&);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void advanceTime(F32 dt) override;
bool onAdd() override;
void onRemove() override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
void setTransform(const MatrixF&) override;
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
DECLARE_CONOBJECT(afxMooring);
DECLARE_CATEGORY("UNLISTED");

90
Engine/source/afx/ce/afxParticleEmitter.h
View file

@ -56,13 +56,13 @@ public:
/*C*/ afxParticleEmitterData();
/*C*/ afxParticleEmitterData(const afxParticleEmitterData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -80,13 +80,13 @@ public:
/*C*/ afxParticleEmitterVectorData();
/*C*/ afxParticleEmitterVectorData(const afxParticleEmitterVectorData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -108,13 +108,13 @@ public:
/*C*/ afxParticleEmitterConeData();
/*C*/ afxParticleEmitterConeData(const afxParticleEmitterConeData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -150,14 +150,14 @@ public:
/*C*/ afxParticleEmitterPathData();
/*C*/ afxParticleEmitterPathData(const afxParticleEmitterPathData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual void onPerformSubstitutions();
virtual bool allowSubstitutions() const { return true; }
void onPerformSubstitutions() override;
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -182,13 +182,13 @@ public:
/*C*/ afxParticleEmitterDiscData();
/*C*/ afxParticleEmitterDiscData(const afxParticleEmitterDiscData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -225,7 +225,7 @@ protected:
void afx_emitParticles(const Point3F& start, const Point3F& end, const Point3F& velocity, const U32 numMilliseconds);
void preCompute(const MatrixF& mat);
virtual void sub_particleUpdate(Particle*);
void sub_particleUpdate(Particle*) override;
virtual void sub_preCompute(const MatrixF& mat)=0;
virtual void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx)=0;
@ -233,13 +233,13 @@ public:
/*C*/ afxParticleEmitter();
/*D*/ ~afxParticleEmitter();
virtual void emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds);
void emitParticlesExt(const MatrixF& xfm, const Point3F& point, const Point3F& velocity, const U32 numMilliseconds) override;
afxParticleEmitterData* getDataBlock(){ return mDataBlock; }
void setAFXOwner(const SimObject* owner) { afx_owner = owner; }
bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onAdd();
void onRemove();
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
bool onAdd() override;
void onRemove() override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -256,11 +256,11 @@ public:
/*C*/ afxParticleEmitterVector();
/*D*/ ~afxParticleEmitterVector();
bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected:
void sub_preCompute(const MatrixF& mat);
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt);
void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -278,11 +278,11 @@ public:
/*C*/ afxParticleEmitterCone();
/*D*/ ~afxParticleEmitterCone();
bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected:
void sub_preCompute(const MatrixF& mat);
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -309,13 +309,13 @@ public:
/*C*/ afxParticleEmitterPath();
/*D*/ ~afxParticleEmitterPath();
bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected:
bool onAdd();
void onRemove();
void sub_preCompute(const MatrixF& mat);
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
bool onAdd() override;
void onRemove() override;
void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -333,11 +333,11 @@ public:
/*C*/ afxParticleEmitterDisc();
/*D*/ ~afxParticleEmitterDisc();
bool onNewDataBlock(GameBaseData* dptr, bool reload);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected:
void sub_preCompute(const MatrixF& mat);
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx);
void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

16
Engine/source/afx/ce/afxPhraseEffect.h
View file

@ -42,7 +42,7 @@ class afxPhraseEffectData : public GameBaseData, public afxEffectDefs, public af
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
};
bool do_id_convert;
@ -88,17 +88,17 @@ public:
/*C*/ afxPhraseEffectData();
/*C*/ afxPhraseEffectData(const afxPhraseEffectData&, bool = false);
virtual void reloadReset();
void reloadReset() override;
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual void gather_cons_defs(Vector<afxConstraintDef>& defs);
void gather_cons_defs(Vector<afxConstraintDef>& defs) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

6
Engine/source/afx/ce/afxPhysicalZone.h
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxPhysicalZoneData();
/*C*/ afxPhysicalZoneData(const afxPhysicalZoneData&, bool = false);
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxPlayerMovement.h
View file

@ -51,13 +51,13 @@ public:
/*C*/ afxPlayerMovementData();
/*C*/ afxPlayerMovementData(const afxPlayerMovementData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool hasMovementOverride();
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

10
Engine/source/afx/ce/afxPlayerPuppet.h
View file

@ -40,17 +40,17 @@ public:
U8 networking;
virtual void gather_cons_defs(Vector<afxConstraintDef>& defs);
void gather_cons_defs(Vector<afxConstraintDef>& defs) override;
public:
/*C*/ afxPlayerPuppetData();
/*C*/ afxPlayerPuppetData(const afxPlayerPuppetData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxPointLight_T3D.h
View file

@ -39,11 +39,11 @@ public:
/*C*/ afxT3DPointLightData();
/*C*/ afxT3DPointLightData(const afxT3DPointLightData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

2
Engine/source/afx/ce/afxProjectile.cpp
View file

@ -351,7 +351,7 @@ void afxProjectile::unpackUpdate(NetConnection * conn, BitStream * stream)
class afxProjectileDeleteEvent : public SimEvent
{
public:
void process(SimObject *object)
void process(SimObject *object) override
{
object->deleteObject();
}

26
Engine/source/afx/ce/afxProjectile.h
View file

@ -63,11 +63,11 @@ public:
/*C*/ afxProjectileData();
/*C*/ afxProjectileData(const afxProjectileData&, bool = false);
virtual bool onAdd();
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd() override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -97,15 +97,15 @@ public:
void init(Point3F& pos, Point3F& vel, ShapeBase* src_obj);
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void processTick(const Move *move);
virtual void interpolateTick(F32 delta);
virtual void advanceTime(F32 dt);
virtual bool onAdd();
virtual void onRemove();
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
virtual void explode(const Point3F& p, const Point3F& n, const U32 collideType);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void processTick(const Move *move) override;
void interpolateTick(F32 delta) override;
void advanceTime(F32 dt) override;
bool onAdd() override;
void onRemove() override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
void explode(const Point3F& p, const Point3F& n, const U32 collideType) override;
DECLARE_CONOBJECT(afxProjectile);
DECLARE_CATEGORY("UNLISTED");

6
Engine/source/afx/ce/afxScriptEvent.h
View file

@ -41,10 +41,10 @@ public:
/*C*/ afxScriptEventData();
/*C*/ afxScriptEventData(const afxScriptEventData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

8
Engine/source/afx/ce/afxSpotLight_T3D.h
View file

@ -41,11 +41,11 @@ public:
/*C*/ afxT3DSpotLightData();
/*C*/ afxT3DSpotLightData(const afxT3DSpotLightData&, bool = false);
virtual bool onAdd();
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
bool onAdd() override;
void packData(BitStream*) override;
void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

16
Engine/source/afx/ce/afxStaticShape.h
View file

@ -46,10 +46,10 @@ public:
/*C*/ afxStaticShapeData();
/*C*/ afxStaticShapeData(const afxStaticShapeData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -72,7 +72,7 @@ private:
StringTableEntry mGhost_cons_name;
protected:
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
public:
/*C*/ afxStaticShape();
@ -80,10 +80,10 @@ public:
void init(U32 chor_id, StringTableEntry cons_name);
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void advanceTime(F32 dt);
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void advanceTime(F32 dt) override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
const char* getShapeFileName() const { return mDataBlock->mShapeAsset->getShapeFileName(); }
void setVisibility(bool flag) { mIs_visible = flag; }

16
Engine/source/afx/ce/afxZodiacPlane.h
View file

@ -84,12 +84,12 @@ public:
/*C*/ afxZodiacPlaneData();
/*C*/ afxZodiacPlaneData(const afxZodiacPlaneData&, bool = false);
virtual void packData(BitStream*);
virtual void unpackData(BitStream*);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
F32 calcRotationAngle(F32 elapsed, F32 rate_factor=1.0f);
@ -128,15 +128,15 @@ public:
/*C*/ afxZodiacPlane();
/*D*/ ~afxZodiacPlane();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual bool onAdd();
virtual void onRemove();
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
bool onAdd() override;
void onRemove() override;
void setRadius(F32 rad) { radius = rad; }
void setColor(const LinearColorF& clr) { color = clr; }
void setVisibility(bool flag) { is_visible = flag; }
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
void _renderZodiacPlane(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*);