TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/.clang-tidy Normal file
View file

@ -0,0 +1,6 @@
---
Checks: '-*,modernize-use-override'
WarningsAsErrors: ''
HeaderFilterRegex: '(source/).*'
CheckOptions:
- { key: modernize-use-override.IgnoreDestructors, value: true }

8
Engine/source/T3D/gameBase/extended/extendedMove.h
View file

@ -29,11 +29,11 @@ struct ExtendedMove : public Move
ExtendedMove();
virtual void pack(BitStream *stream, const Move * move = NULL);
virtual void unpack(BitStream *stream, const Move * move = NULL);
void pack(BitStream *stream, const Move * move = NULL) override;
void unpack(BitStream *stream, const Move * move = NULL) override;
virtual void clamp();
virtual void unclamp();
void clamp() override;
void unclamp() override;
};
extern const ExtendedMove NullExtendedMove;

50
Engine/source/afx/afxCamera.h
View file

@ -52,8 +52,8 @@ struct afxCameraData: public ShapeBaseData {
//
DECLARE_CONOBJECT(afxCameraData);
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
};
@ -140,7 +140,7 @@ public:
void setThirdPersonSnapClient();
const char* getMode();
bool isCamera() const { return true; }
bool isCamera() const override { return true; }
DECLARE_CONOBJECT(afxCamera);
DECLARE_CATEGORY("UNLISTED");
@ -151,35 +151,35 @@ private: // 3POV SECTION
bool test_blocked_line(const Point3F& start, const Point3F& end);
public: // STD OVERRIDES SECTION
virtual bool onAdd();
virtual void onRemove();
virtual void onDeleteNotify(SimObject *obj);
bool onAdd() override;
void onRemove() override;
void onDeleteNotify(SimObject *obj) override;
virtual void advanceTime(F32 dt);
virtual void processTick(const Move* move);
virtual void interpolateTick(F32 delta);
void advanceTime(F32 dt) override;
void processTick(const Move* move) override;
void interpolateTick(F32 delta) override;
virtual void writePacketData(GameConnection *conn, BitStream *stream);
virtual void readPacketData(GameConnection *conn, BitStream *stream);
virtual U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
virtual void unpackUpdate(NetConnection *conn, BitStream *stream);
void writePacketData(GameConnection *conn, BitStream *stream) override;
void readPacketData(GameConnection *conn, BitStream *stream) override;
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
virtual void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*);
virtual void getCameraTransform(F32* pos,MatrixF* mat);
virtual void setTransform(const MatrixF& mat);
void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*) override;
void getCameraTransform(F32* pos,MatrixF* mat) override;
void setTransform(const MatrixF& mat) override;
virtual void onEditorEnable();
virtual void onEditorDisable();
void onEditorEnable() override;
void onEditorDisable() override;
virtual F32 getCameraFov();
virtual F32 getDefaultCameraFov();
virtual bool isValidCameraFov(F32 fov);
virtual void setCameraFov(F32 fov);
F32 getCameraFov() override;
F32 getDefaultCameraFov() override;
bool isValidCameraFov(F32 fov) override;
void setCameraFov(F32 fov) override;
virtual F32 getDamageFlash() const;
virtual F32 getWhiteOut() const;
F32 getDamageFlash() const override;
F32 getWhiteOut() const override;
virtual void setControllingClient( GameConnection* connection );
void setControllingClient( GameConnection* connection ) override;
};

20
Engine/source/afx/afxChoreographer.h
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxChoreographerData();
/*C*/ afxChoreographerData(const afxChoreographerData&, 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;
static void initPersistFields();
@ -137,12 +137,12 @@ public:
static void initPersistFields();
virtual bool onAdd();
virtual void onRemove();
virtual void onDeleteNotify(SimObject*);
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
bool onAdd() override;
void onRemove() override;
void onDeleteNotify(SimObject*) override;
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
virtual void sync_with_clients() { }
@ -196,7 +196,7 @@ public:
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
// missile watcher callbacks
public:
virtual void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) { }
void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override { }
DECLARE_CONOBJECT(afxChoreographer);
DECLARE_CATEGORY("UNLISTED");

166
Engine/source/afx/afxConstraint.h
View file

@ -278,14 +278,14 @@ public:
virtual ~afxPointConstraint();
virtual void set(Point3F point, Point3F vector);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual SceneObject* getSceneObject() { return 0; }
virtual void restoreObject(SceneObject*) { }
virtual U16 getScopeId() { return 0; }
virtual U32 getTriggers() { return 0; }
SceneObject* getSceneObject() override { return 0; }
void restoreObject(SceneObject*) override { }
U16 getScopeId() override { return 0; }
U32 getTriggers() override { return 0; }
virtual void unset() { set(Point3F::Zero, Point3F(0,0,1)); }
void unset() override { set(Point3F::Zero, Point3F(0,0,1)); }
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -305,14 +305,14 @@ public:
virtual ~afxTransformConstraint();
virtual void set(const MatrixF& xfm);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual SceneObject* getSceneObject() { return 0; }
virtual void restoreObject(SceneObject*) { }
virtual U16 getScopeId() { return 0; }
virtual U32 getTriggers() { return 0; }
SceneObject* getSceneObject() override { return 0; }
void restoreObject(SceneObject*) override { }
U16 getScopeId() override { return 0; }
U32 getTriggers() override { return 0; }
virtual void unset() { set(MatrixF::Identity); }
void unset() override { set(MatrixF::Identity); }
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -341,27 +341,27 @@ public:
virtual ~afxShapeConstraint();
virtual void set(ShapeBase* shape);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim);
virtual void resetAnimation(U32 tag);
virtual U32 lockAnimation();
virtual void unlockAnimation(U32 tag);
virtual F32 getAnimClipDuration(const char* clip);
U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
void resetAnimation(U32 tag) override;
U32 lockAnimation() override;
void unlockAnimation(U32 tag) override;
F32 getAnimClipDuration(const char* clip) override;
void remapAnimation(U32 tag, ShapeBase* other_shape);
virtual S32 getDamageState();
S32 getDamageState() override;
virtual SceneObject* getSceneObject() { return mShape; }
virtual void restoreObject(SceneObject*);
virtual U16 getScopeId() { return mScope_id; }
virtual U32 getTriggers();
SceneObject* getSceneObject() override { return mShape; }
void restoreObject(SceneObject*) override;
U16 getScopeId() override { return mScope_id; }
U32 getTriggers() override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
virtual void unset() { set(0); }
void unset() override { set(0); }
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -380,14 +380,14 @@ public:
/*C*/ afxShapeNodeConstraint(afxConstraintMgr*);
/*C*/ afxShapeNodeConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
virtual void set(ShapeBase* shape);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
virtual void restoreObject(SceneObject*);
void set(ShapeBase* shape) override;
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
void restoreObject(SceneObject*) override;
S32 getNodeID() const { return mShape_node_ID; }
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -415,17 +415,17 @@ public:
virtual ~afxObjectConstraint();
virtual void set(SceneObject* obj);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual SceneObject* getSceneObject() { return mObj; }
virtual void restoreObject(SceneObject*);
virtual U16 getScopeId() { return mScope_id; }
virtual U32 getTriggers();
SceneObject* getSceneObject() override { return mObj; }
void restoreObject(SceneObject*) override;
U16 getScopeId() override { return mScope_id; }
U32 getTriggers() override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
virtual void unset() { set(0); }
void unset() override { set(0); }
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -452,23 +452,23 @@ public:
/*C*/ afxEffectConstraint(afxConstraintMgr*, StringTableEntry effect_name);
virtual ~afxEffectConstraint();
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
virtual bool getAltitudes(F32& terrain_alt, F32& interior_alt);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
bool getAltitudes(F32& terrain_alt, F32& interior_alt) override;
virtual void set(afxEffectWrapper* effect);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) { }
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override { }
virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim);
virtual void resetAnimation(U32 tag);
virtual F32 getAnimClipDuration(const char* clip);
U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
void resetAnimation(U32 tag) override;
F32 getAnimClipDuration(const char* clip) override;
virtual SceneObject* getSceneObject() { return 0; }
virtual void restoreObject(SceneObject*) { }
virtual U16 getScopeId() { return 0; }
virtual U32 getTriggers();
SceneObject* getSceneObject() override { return 0; }
void restoreObject(SceneObject*) override { }
U16 getScopeId() override { return 0; }
U32 getTriggers() override;
virtual void unset() { set(0); }
void unset() override { set(0); }
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -487,10 +487,10 @@ public:
/*C*/ afxEffectNodeConstraint(afxConstraintMgr*);
/*C*/ afxEffectNodeConstraint(afxConstraintMgr*, StringTableEntry name, StringTableEntry node);
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
virtual void set(afxEffectWrapper* effect);
void set(afxEffectWrapper* effect) override;
S32 getNodeID() const { return mEffect_node_ID; }
};
@ -532,14 +532,14 @@ class afxSampleXfmBuffer : public afxSampleBuffer
protected:
MatrixF* mXfm_buffer;
virtual void recSample(U32 idx, void* data);
void recSample(U32 idx, void* data) override;
public:
/*C*/ afxSampleXfmBuffer();
virtual ~afxSampleXfmBuffer();
virtual void configHistory(F32 hist_len, U8 sample_rate);
virtual void getSample(F32 lag, void* data, bool& oob);
void configHistory(F32 hist_len, U8 sample_rate) override;
void getSample(F32 lag, void* data, bool& oob) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -558,11 +558,11 @@ public:
/*C*/ afxPointHistConstraint(afxConstraintMgr*);
virtual ~afxPointHistConstraint();
virtual void set(Point3F point, Point3F vector);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set(Point3F point, Point3F vector) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -581,11 +581,11 @@ public:
/*C*/ afxTransformHistConstraint(afxConstraintMgr*);
virtual ~afxTransformHistConstraint();
virtual void set(const MatrixF& xfm);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set(const MatrixF& xfm) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -605,14 +605,14 @@ public:
/*C*/ afxShapeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
virtual ~afxShapeHistConstraint();
virtual void set(ShapeBase* shape);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set(ShapeBase* shape) override;
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -632,14 +632,14 @@ public:
/*C*/ afxShapeNodeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
virtual ~afxShapeNodeHistConstraint();
virtual void set(ShapeBase* shape);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set(ShapeBase* shape) override;
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -661,14 +661,14 @@ public:
afxObjectHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
virtual ~afxObjectHistConstraint();
virtual void set(SceneObject* obj);
virtual void set_scope_id(U16 scope_id);
virtual void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos);
void set(SceneObject* obj) override;
void set_scope_id(U16 scope_id) override;
void sample(F32 dt, U32 elapsed_ms, const Point3F* cam_pos) override;
virtual bool getPosition(Point3F& pos, F32 hist=0.0f);
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f);
bool getPosition(Point3F& pos, F32 hist=0.0f) override;
bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

14
Engine/source/afx/afxEffectGroup.h
View file

@ -60,7 +60,7 @@ class afxEffectGroupData : public afxEffectBaseData
U32 id;
public:
egValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
};
bool do_id_convert;
@ -82,16 +82,16 @@ public:
/*C*/ afxEffectGroupData();
/*C*/ afxEffectGroupData(const afxEffectGroupData&, bool = false);
virtual void reloadReset();
void reloadReset() override;
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 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();

14
Engine/source/afx/afxEffectWrapper.h
View file

@ -175,7 +175,7 @@ public:
void parse_cons_specs();
void parse_vis_keys();
void gather_cons_defs(Vector<afxConstraintDef>& defs);
void gather_cons_defs(Vector<afxConstraintDef>& defs) override;
void pack_mods(BitStream*, afxXM_BaseData* mods[], bool packed);
void unpack_mods(BitStream*, afxXM_BaseData* mods[]);
@ -184,13 +184,13 @@ public:
/*C*/ afxEffectWrapperData(const afxEffectWrapperData&, bool = false);
/*D*/ ~afxEffectWrapperData();
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 onPerformSubstitutions();
void onPerformSubstitutions() override;
bool requiresStop(const afxEffectTimingData& timing) { return effect_desc->requiresStop(this, timing); }
bool runsOnServer() { return effect_desc->runsOnServer(this); }
@ -201,7 +201,7 @@ public:
F32 afterStopTime() { return ewd_timing.fade_out_time; }
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();

2
Engine/source/afx/afxEffectron.cpp
View file

@ -56,7 +56,7 @@ void afxEffectronData::ewValidator::validateType(SimObject* object, void* typePt
class EffectronFinishStartupEvent : public SimEvent
{
public:
void process(SimObject* obj)
void process(SimObject* obj) override
{
afxEffectron* eff = dynamic_cast<afxEffectron*>(obj);
if (eff)

34
Engine/source/afx/afxEffectron.h
View file

@ -46,7 +46,7 @@ class afxEffectronData : public afxChoreographerData
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;
@ -67,17 +67,17 @@ public:
/*C*/ afxEffectronData();
/*C*/ afxEffectronData(const afxEffectronData&, 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;
void gatherConstraintDefs(Vector<afxConstraintDef>&);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -127,7 +127,7 @@ public:
class ObjectDeleteEvent : public SimEvent
{
public:
void process(SimObject *obj) { if (obj) obj->deleteObject(); }
void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
};
private:
@ -164,16 +164,16 @@ public:
/*D*/ ~afxEffectron();
// STANDARD OVERLOADED METHODS //
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void processTick(const Move*);
virtual void advanceTime(F32 dt);
virtual bool onAdd();
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void processTick(const Move*) override;
void advanceTime(F32 dt) override;
bool onAdd() override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
virtual void inflictDamage(const char * label, const char* flavor, SimObjectId target,
F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp);
virtual void sync_with_clients();
void inflictDamage(const char * label, const char* flavor, SimObjectId target,
F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override;
void sync_with_clients() override;
void finish_startup();
DECLARE_CONOBJECT(afxEffectron);

2
Engine/source/afx/afxMagicMissile.cpp
View file

@ -67,7 +67,7 @@
class ObjectDeleteEvent : public SimEvent
{
public:
void process(SimObject *object)
void process(SimObject *object) override
{
object->deleteObject();
}

32
Engine/source/afx/afxMagicMissile.h
View file

@ -61,7 +61,7 @@ class afxMagicMissileData : public GameBaseData
typedef GameBaseData Parent;
protected:
bool onAdd();
bool onAdd() override;
public:
enum { MaxLifetimeTicks = 4095 };
@ -210,10 +210,10 @@ public:
/*C*/ afxMagicMissileData();
/*D*/ ~afxMagicMissileData();
void packData(BitStream*);
void unpackData(BitStream*);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
static void initPersistFields();
@ -223,7 +223,7 @@ public:
/*C*/ afxMagicMissileData(const afxMagicMissileData&, bool = false);
afxMagicMissileData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
void gather_cons_defs(Vector<afxConstraintDef>& defs);
};
@ -290,8 +290,8 @@ protected:
*/
// ISceneLight
virtual void submitLights( LightManager *lm, bool staticLighting );
virtual LightInfo* getLight() { return mLight; }
void submitLights( LightManager *lm, bool staticLighting ) override;
LightInfo* getLight() override { return mLight; }
LightInfo *mLight;
LightState mLightState;
@ -319,19 +319,19 @@ protected:
U32 mCollideHitType;
*/
bool onAdd();
void onRemove();
bool onNewDataBlock(GameBaseData *dptr, bool reload);
bool onAdd() override;
void onRemove() override;
bool onNewDataBlock(GameBaseData *dptr, bool reload) override;
// Rendering
virtual void prepRenderImage(SceneRenderState*);
void prepRenderImage(SceneRenderState*) override;
void prepBatchRender( SceneRenderState *state);
void processTick(const Move *move);
void processTick(const Move *move) override;
/*
void advanceTime(F32 dt);
*/
void interpolateTick(F32 delta);
void interpolateTick(F32 delta) override;
/*
/// What to do once this projectile collides with something
@ -355,8 +355,8 @@ protected:
// These are stolen from the player class ..
bool pointInWater(const Point3F &point);
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
afxChoreographer* choreographer;
@ -396,7 +396,7 @@ public:
/*C*/ afxMagicMissile();
/*C*/ afxMagicMissile(bool on_server, bool on_client);
/*D*/ ~afxMagicMissile();
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
DECLARE_CONOBJECT(afxMagicMissile);
DECLARE_CATEGORY("UNLISTED");

10
Engine/source/afx/afxMagicSpell.cpp
View file

@ -77,7 +77,7 @@ void afxMagicSpellData::ewValidator::validateType(SimObject* object, void* typeP
class SpellFinishStartupEvent : public SimEvent
{
public:
void process(SimObject* obj)
void process(SimObject* obj) override
{
afxMagicSpell* spell = dynamic_cast<afxMagicSpell*>(obj);
if (spell)
@ -574,10 +574,10 @@ class CastingPhrase_C : public afxPhrase
F32 mCastbar_progress;
public:
/*C*/ CastingPhrase_C(ShapeBase* caster, bool notify_castbar);
virtual void start(F32 startstamp, F32 timestamp);
virtual void update(F32 dt, F32 timestamp);
virtual void stop(F32 timestamp);
virtual void interrupt(F32 timestamp);
void start(F32 startstamp, F32 timestamp) override;
void update(F32 dt, F32 timestamp) override;
void stop(F32 timestamp) override;
void interrupt(F32 timestamp) override;
};
CastingPhrase_C::CastingPhrase_C(ShapeBase* c, bool notify)

54
Engine/source/afx/afxMagicSpell.h
View file

@ -65,7 +65,7 @@ class afxMagicSpellData : public afxChoreographerData, public afxMagicSpellDefs
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr);
void validateType(SimObject *object, void *typePtr) override;
};
bool mDo_id_convert;
@ -106,18 +106,18 @@ public:
/*C*/ afxMagicSpellData();
/*C*/ afxMagicSpellData(const afxMagicSpellData&, bool = false);
virtual void reloadReset();
void reloadReset() override;
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;
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
void gatherConstraintDefs(Vector<afxConstraintDef>&);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -208,7 +208,7 @@ public:
class ObjectDeleteEvent : public SimEvent
{
public:
void process(SimObject *obj) { if (obj) obj->deleteObject(); }
void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
};
private:
@ -272,9 +272,9 @@ private:
bool is_impact_in_water(SceneObject* obj, const Point3F& p);
protected:
virtual bool remap_builtin_constraint(SceneObject*, const char* cons_name); // CONSTRAINT REMAPPING
virtual void pack_constraint_info(NetConnection* conn, BitStream* stream);
virtual void unpack_constraint_info(NetConnection* conn, BitStream* stream);
bool remap_builtin_constraint(SceneObject*, const char* cons_name) override; // CONSTRAINT REMAPPING
void pack_constraint_info(NetConnection* conn, BitStream* stream) override;
void unpack_constraint_info(NetConnection* conn, BitStream* stream) override;
private:
afxMagicMissile* mMissile;
@ -292,11 +292,11 @@ private:
void launch_missile_c();
public:
virtual void impactNotify(const Point3F& p, const Point3F& n, SceneObject*);
virtual void executeScriptEvent(const char* method, afxConstraint*,
const MatrixF& pos, const char* data);
virtual void inflictDamage(const char * label, const char* flavor, SimObjectId target,
F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp);
void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override;
void executeScriptEvent(const char* method, afxConstraint*,
const MatrixF& pos, const char* data) override;
void inflictDamage(const char * label, const char* flavor, SimObjectId target,
F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override;
public:
/*C*/ afxMagicSpell();
@ -304,16 +304,16 @@ public:
/*D*/ ~afxMagicSpell();
// STANDARD OVERLOADED METHODS //
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void processTick(const Move*);
virtual void advanceTime(F32 dt);
virtual bool onAdd();
virtual void onRemove();
virtual void onDeleteNotify(SimObject*);
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void processTick(const Move*) override;
void advanceTime(F32 dt) override;
bool onAdd() override;
void onRemove() override;
void onDeleteNotify(SimObject*) override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
virtual void sync_with_clients();
void sync_with_clients() override;
void finish_startup();
static void initPersistFields();
@ -361,7 +361,7 @@ public:
afxMagicMissile* getMissile() const { return mMissile; }
SceneObject* getImpactedObject() const { return mImpacted_obj; }
virtual void restoreObject(SceneObject*);
void restoreObject(SceneObject*) override;
bool activationCallInit(bool postponed=false);
void activate();

4
Engine/source/afx/afxRenderHighlightMgr.h
View file

@ -60,8 +60,8 @@ public:
bool isSelectionEnabled();
// RenderBinManager
virtual void addElement( RenderInst *inst );
virtual void render( SceneRenderState *state );
void addElement( RenderInst *inst ) override;
void render( SceneRenderState *state ) override;
// ConsoleObject
DECLARE_CONOBJECT( afxRenderHighlightMgr );

2
Engine/source/afx/afxResidueMgr.h
View file

@ -153,7 +153,7 @@ public:
/*D*/ ~afxResidueMgr();
void cleanup();
virtual void onDeleteNotify(SimObject *obj);
void onDeleteNotify(SimObject *obj) override;
public:
void residueAdvanceTime();

2
Engine/source/afx/afxSelectron.cpp
View file

@ -66,7 +66,7 @@ void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePt
class SelectronFinishStartupEvent : public SimEvent
{
public:
void process(SimObject* obj)
void process(SimObject* obj) override
{
afxSelectron* selectron = dynamic_cast<afxSelectron*>(obj);
if (selectron)

32
Engine/source/afx/afxSelectron.h
View file

@ -57,7 +57,7 @@ class afxSelectronData : public afxChoreographerData, public afxSelectronDefs
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;
@ -90,18 +90,18 @@ public:
/*C*/ afxSelectronData(const afxSelectronData&, bool = false);
/*D*/ ~afxSelectronData();
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;
bool matches(U32 mask, U8 style);
void gatherConstraintDefs(Vector<afxConstraintDef>&);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
static void initPersistFields();
@ -163,7 +163,7 @@ public:
class ObjectDeleteEvent : public SimEvent
{
public:
void process(SimObject *obj) { if (obj) obj->deleteObject(); }
void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
};
private:
@ -206,15 +206,15 @@ public:
/*D*/ ~afxSelectron();
// STANDARD OVERLOADED METHODS //
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void processTick(const Move*);
virtual void advanceTime(F32 dt);
virtual bool onAdd();
virtual void onRemove();
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void processTick(const Move*) override;
void advanceTime(F32 dt) override;
bool onAdd() override;
void onRemove() override;
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
virtual void sync_with_clients();
void sync_with_clients() override;
void finish_startup();
DECLARE_CONOBJECT(afxSelectron);

20
Engine/source/afx/afxSpellBook.h
View file

@ -57,10 +57,10 @@ public:
public:
/*C*/ afxSpellBookData();
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;
bool verifyPageSlot(S32 page, S32 slot);
S32 getPageSlotIndex(S32 page, S32 slot);
@ -104,15 +104,15 @@ public:
/*C*/ afxSpellBook();
/*D*/ ~afxSpellBook();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload);
virtual void processTick(const Move*);
virtual void advanceTime(F32 dt);
bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
void processTick(const Move*) override;
void advanceTime(F32 dt) override;
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
virtual U32 packUpdate(NetConnection*, U32, BitStream*);
virtual void unpackUpdate(NetConnection*, BitStream*);
U32 packUpdate(NetConnection*, U32, BitStream*) override;
void unpackUpdate(NetConnection*, BitStream*) override;
static void initPersistFields();

6
Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h
View file

@ -71,13 +71,13 @@ public:
/*D*/ ~afxZodiacGroundPlaneRenderer();
// RenderBinManager
virtual void sort(){} // don't sort them
virtual void clear();
void sort() override{} // don't sort them
void clear() override;
void initShader();
void addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const GroundPlane*, F32 camDist);
virtual void render(SceneRenderState* state);
void render(SceneRenderState* state) override;
static afxZodiacGroundPlaneRenderer* getMaster();

6
Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h
View file

@ -72,13 +72,13 @@ public:
/*D*/ ~afxZodiacMeshRoadRenderer();
// RenderBinManager
virtual void sort(){} // don't sort them
virtual void clear();
void sort() override{} // don't sort them
void clear() override;
void initShader();
void addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const MeshRoad*, F32 camDist);
virtual void render(SceneRenderState*);
void render(SceneRenderState*) override;
static afxZodiacMeshRoadRenderer* getMaster();

6
Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h
View file

@ -72,13 +72,13 @@ public:
/*D*/ ~afxZodiacPolysoupRenderer();
// RenderBinManager
virtual void sort(){} // don't sort them
virtual void clear();
void sort() override{} // don't sort them
void clear() override;
void initShader();
void addZodiac(U32 zode_idx, ConcretePolyList*, const Point3F& pos, F32 ang, const TSStatic*, F32 camDist);
virtual void render(SceneRenderState*);
void render(SceneRenderState*) override;
static afxZodiacPolysoupRenderer* getMaster();

6
Engine/source/afx/afxZodiacTerrainRenderer_T3D.h
View file

@ -72,13 +72,13 @@ public:
/*D*/ ~afxZodiacTerrainRenderer();
// RenderBinManager
virtual void sort(){} // don't sort them
virtual void clear();
void sort() override{} // don't sort them
void clear() override;
void initShader();
void addZodiac(U32 zode_idx, const Point3F& pos, F32 ang, const TerrainBlock*, const TerrCell*, const MatrixF& mRenderObjToWorld, F32 camDist);
virtual void render(SceneRenderState*);
void render(SceneRenderState*) override;
static afxZodiacTerrainRenderer* getMaster();

8
Engine/source/afx/arcaneFX.cpp
View file

@ -69,11 +69,11 @@ public:
ClientZoneInEvent() { mGuaranteeType = Guaranteed; }
~ClientZoneInEvent() { }
virtual void pack(NetConnection*, BitStream*bstream) { }
virtual void write(NetConnection*, BitStream *bstream) { }
virtual void unpack(NetConnection* /*ps*/, BitStream *bstream) { }
void pack(NetConnection*, BitStream*bstream) override { }
void write(NetConnection*, BitStream *bstream) override { }
void unpack(NetConnection* /*ps*/, BitStream *bstream) override { }
virtual void process(NetConnection* conn)
void process(NetConnection* conn) override
{
GameConnection* game_conn = dynamic_cast<GameConnection*>(conn);
if (game_conn && !game_conn->isZonedIn())

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*);

20
Engine/source/afx/ea/afxEA_AnimClip.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_AnimClip();
/*C*/ ~afxEA_AnimClip();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -176,13 +176,13 @@ class afxEA_AnimClipDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimClipDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AnimClip; }
afxEffectWrapper* create() const override { return new afxEA_AnimClip; }
};
afxEA_AnimClipDesc afxEA_AnimClipDesc::desc;

16
Engine/source/afx/ea/afxEA_AnimLock.cpp
View file

@ -42,8 +42,8 @@ class afxEA_AnimLock : public afxEffectWrapper
public:
/*C*/ afxEA_AnimLock();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -84,13 +84,13 @@ class afxEA_AnimLockDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimLockDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AnimLock; }
afxEffectWrapper* create() const override { return new afxEA_AnimLock; }
};
afxEA_AnimLockDesc afxEA_AnimLockDesc::desc;

20
Engine/source/afx/ea/afxEA_AreaDamage.cpp
View file

@ -53,12 +53,12 @@ public:
/*C*/ afxEA_AreaDamage();
/*C*/ ~afxEA_AreaDamage();
virtual bool isDone();
bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -246,12 +246,12 @@ class afxEA_AreaDamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AreaDamageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AreaDamage; }
afxEffectWrapper* create() const override { return new afxEA_AreaDamage; }
};
afxEA_AreaDamageDesc afxEA_AreaDamageDesc::desc;

18
Engine/source/afx/ea/afxEA_AudioBank.cpp
View file

@ -53,10 +53,10 @@ public:
/*C*/ afxEA_AudioBank();
/*D*/ ~afxEA_AudioBank();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,13 +153,13 @@ class afxEA_SoundBankDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_SoundBankDesc mDesc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
//virtual void prepEffect(afxEffectWrapperData*) const;
virtual afxEffectWrapper* create() const { return new afxEA_AudioBank; }
afxEffectWrapper* create() const override { return new afxEA_AudioBank; }
};
afxEA_SoundBankDesc afxEA_SoundBankDesc::mDesc;

26
Engine/source/afx/ea/afxEA_Billboard.cpp
View file

@ -47,14 +47,14 @@ public:
/*C*/ afxEA_Billboard();
/*D*/ ~afxEA_Billboard();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual void getBaseColor(LinearColorF& color) { if (bb_data) color = bb_data->color; }
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getUpdatedBoxCenter(Point3F& pos) override;
void getBaseColor(LinearColorF& color) override { if (bb_data) color = bb_data->color; }
};
@ -174,12 +174,12 @@ class afxEA_BillboardDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_BillboardDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Billboard; }
afxEffectWrapper* create() const override { return new afxEA_Billboard; }
};
//~~~~~~~~~~~~~~~~~~~~//

22
Engine/source/afx/ea/afxEA_CameraPuppet.cpp
View file

@ -50,13 +50,13 @@ class afxEA_CameraPuppet : public afxEffectWrapper
public:
/*C*/ afxEA_CameraPuppet();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual void getUnconstrainedPosition(Point3F& pos);
virtual void getUnconstrainedTransform(MatrixF& xfm);
void getUnconstrainedPosition(Point3F& pos) override;
void getUnconstrainedTransform(MatrixF& xfm) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -164,12 +164,12 @@ class afxEA_CameraPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_CameraPuppetDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_CameraPuppet; }
afxEffectWrapper* create() const override { return new afxEA_CameraPuppet; }
};
afxEA_CameraPuppetDesc afxEA_CameraPuppetDesc::desc;

20
Engine/source/afx/ea/afxEA_CameraShake.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_CameraShake();
/*D*/ ~afxEA_CameraShake();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -172,13 +172,13 @@ class afxEA_CameraShakeDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_CameraShakeDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_CameraShake; }
afxEffectWrapper* create() const override { return new afxEA_CameraShake; }
};
afxEA_CameraShakeDesc afxEA_CameraShakeDesc::desc;

24
Engine/source/afx/ea/afxEA_CollisionEvent.cpp
View file

@ -49,13 +49,13 @@ public:
/*C*/ afxEA_CollisionEvent();
/*D*/ ~afxEA_CollisionEvent();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel);
virtual void onDeleteNotify(SimObject*);
void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -201,13 +201,13 @@ class afxEA_CollisionEventDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_CollisionEventDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_CollisionEvent; }
afxEffectWrapper* create() const override { return new afxEA_CollisionEvent; }
};
afxEA_CollisionEventDesc afxEA_CollisionEventDesc::desc;

20
Engine/source/afx/ea/afxEA_ConsoleMessage.cpp
View file

@ -45,11 +45,11 @@ class afxEA_ConsoleMessage : public afxEffectWrapper
public:
/*C*/ afxEA_ConsoleMessage();
virtual bool isDone() { return displayed; }
bool isDone() override { return displayed; }
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -109,13 +109,13 @@ class afxEA_ConsoleMessageDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_ConsoleMessageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_ConsoleMessage; }
afxEffectWrapper* create() const override { return new afxEA_ConsoleMessage; }
};
afxEA_ConsoleMessageDesc afxEA_ConsoleMessageDesc::desc;

20
Engine/source/afx/ea/afxEA_Damage.cpp
View file

@ -51,12 +51,12 @@ public:
/*C*/ afxEA_Damage();
/*C*/ ~afxEA_Damage();
virtual bool isDone();
bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -183,12 +183,12 @@ class afxEA_DamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_DamageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_Damage; }
afxEffectWrapper* create() const override { return new afxEA_Damage; }
};
afxEA_DamageDesc afxEA_DamageDesc::desc;

22
Engine/source/afx/ea/afxEA_Debris.cpp
View file

@ -50,14 +50,14 @@ public:
/*C*/ afxEA_Debris();
/*D*/ ~afxEA_Debris();
virtual bool isDone();
bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -176,12 +176,12 @@ class afxEA_DebrisDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_DebrisDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Debris; }
afxEffectWrapper* create() const override { return new afxEA_Debris; }
};
afxEA_DebrisDesc afxEA_DebrisDesc::desc;

20
Engine/source/afx/ea/afxEA_Explosion.cpp
View file

@ -48,12 +48,12 @@ class afxEA_Explosion : public afxEffectWrapper
public:
/*C*/ afxEA_Explosion();
virtual bool isDone() { return exploded; }
bool isDone() override { return exploded; }
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -127,12 +127,12 @@ class afxEA_ExplosionDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ExplosionDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Explosion; }
afxEffectWrapper* create() const override { return new afxEA_Explosion; }
};
afxEA_ExplosionDesc afxEA_ExplosionDesc::desc;

20
Engine/source/afx/ea/afxEA_FootSwitch.cpp
View file

@ -51,10 +51,10 @@ public:
void set_overrides(Player*);
void clear_overrides(Player*);
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
@ -156,13 +156,13 @@ class afxEA_FootfallSwitchDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_FootfallSwitchDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_FootSwitch; }
afxEffectWrapper* create() const override { return new afxEA_FootSwitch; }
};
afxEA_FootfallSwitchDesc afxEA_FootfallSwitchDesc::desc;

18
Engine/source/afx/ea/afxEA_GuiController.cpp
View file

@ -55,10 +55,10 @@ class afxEA_GuiController : public afxEffectWrapper
public:
/*C*/ afxEA_GuiController();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -193,12 +193,12 @@ class afxEA_GuiControllerDesc : public afxEffectAdapterDesc, public afxEffectDef
static afxEA_GuiControllerDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_GuiController; }
afxEffectWrapper* create() const override { return new afxEA_GuiController; }
};
afxEA_GuiControllerDesc afxEA_GuiControllerDesc::desc;

16
Engine/source/afx/ea/afxEA_GuiText.cpp
View file

@ -53,9 +53,9 @@ class afxEA_GuiText : public afxEffectWrapper
public:
/*C*/ afxEA_GuiText();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -157,12 +157,12 @@ class afxEA_GuiTextDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_GuiTextDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_GuiText; }
afxEffectWrapper* create() const override { return new afxEA_GuiText; }
};
afxEA_GuiTextDesc afxEA_GuiTextDesc::desc;

10
Engine/source/afx/ea/afxEA_Light.cpp
View file

@ -39,12 +39,12 @@ class afxEA_LightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_LightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_LightDesc afxEA_LightDesc::desc;

18
Engine/source/afx/ea/afxEA_MachineGun.cpp
View file

@ -53,10 +53,10 @@ public:
/*C*/ afxEA_MachineGun();
/*D*/ ~afxEA_MachineGun();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -184,12 +184,12 @@ class afxEA_MachineGunDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MachineGunDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_MachineGun; }
afxEffectWrapper* create() const override { return new afxEA_MachineGun; }
};
afxEA_MachineGunDesc afxEA_MachineGunDesc::desc;

36
Engine/source/afx/ea/afxEA_Model.cpp
View file

@ -50,23 +50,23 @@ public:
/*C*/ afxEA_Model();
/*D*/ ~afxEA_Model();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos);
void getUpdatedBoxCenter(Point3F& pos) override;
virtual TSShape* getTSShape();
virtual TSShapeInstance* getTSShapeInstance();
virtual SceneObject* ea_get_scene_object() const;
TSShape* getTSShape() override;
TSShapeInstance* getTSShapeInstance() override;
SceneObject* ea_get_scene_object() const override;
virtual U32 ea_get_triggers() const;
virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans);
virtual void resetAnimation(U32 tag);
virtual F32 getAnimClipDuration(const char* clip);
U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans) override;
void resetAnimation(U32 tag) override;
F32 getAnimClipDuration(const char* clip) override;
};
@ -230,12 +230,12 @@ class afxEA_ModelDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ModelDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Model; }
afxEffectWrapper* create() const override { return new afxEA_Model; }
};
//~~~~~~~~~~~~~~~~~~~~//

20
Engine/source/afx/ea/afxEA_Mooring.cpp
View file

@ -46,11 +46,11 @@ public:
/*C*/ afxEA_Mooring();
/*D*/ ~afxEA_Mooring();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,12 +153,12 @@ class afxEA_MooringDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MooringDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Mooring; }
afxEffectWrapper* create() const override { return new afxEA_Mooring; }
};
afxEA_MooringDesc afxEA_MooringDesc::desc;

10
Engine/source/afx/ea/afxEA_MultiLight.cpp
View file

@ -39,12 +39,12 @@ class afxEA_MultiLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MultiLightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_MultiLightDesc afxEA_MultiLightDesc::desc;

10
Engine/source/afx/ea/afxEA_ParticleEmitter.cpp
View file

@ -299,12 +299,12 @@ class afxEA_ParticleEmitterDesc : public afxEffectAdapterDesc, public afxEffectD
static afxEA_ParticleEmitterDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_ParticleEmitter; }
afxEffectWrapper* create() const override { return new afxEA_ParticleEmitter; }
};
afxEA_ParticleEmitterDesc afxEA_ParticleEmitterDesc::desc;

12
Engine/source/afx/ea/afxEA_ParticleEmitter.h
View file

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_ParticleEmitter();
/*D*/ ~afxEA_ParticleEmitter();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

20
Engine/source/afx/ea/afxEA_PhraseEffect.cpp
View file

@ -61,12 +61,12 @@ public:
/*C*/ afxEA_PhraseEffect();
/*D*/ ~afxEA_PhraseEffect();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -360,12 +360,12 @@ class afxEA_PhraseEffectDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PhraseEffectDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_PhraseEffect; }
afxEffectWrapper* create() const override { return new afxEA_PhraseEffect; }
};
afxEA_PhraseEffectDesc afxEA_PhraseEffectDesc::desc;

22
Engine/source/afx/ea/afxEA_PhysicalZone.cpp
View file

@ -51,12 +51,12 @@ public:
/*C*/ afxEA_PhysicalZone();
/*D*/ ~afxEA_PhysicalZone();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -203,12 +203,12 @@ class afxEA_PhysicalZoneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PhysicalZoneDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_PhysicalZone; }
afxEffectWrapper* create() const override { return new afxEA_PhysicalZone; }
};
afxEA_PhysicalZoneDesc afxEA_PhysicalZoneDesc::desc;

18
Engine/source/afx/ea/afxEA_PlayerMovement.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_PlayerMovement();
/*C*/ ~afxEA_PlayerMovement();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -147,12 +147,12 @@ class afxEA_PlayerMovementDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_PlayerMovementDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_PlayerMovement; }
afxEffectWrapper* create() const override { return new afxEA_PlayerMovement; }
};
afxEA_PlayerMovementDesc afxEA_PlayerMovementDesc::desc;

22
Engine/source/afx/ea/afxEA_PlayerPuppet.cpp
View file

@ -48,13 +48,13 @@ class afxEA_PlayerPuppet : public afxEffectWrapper
public:
/*C*/ afxEA_PlayerPuppet();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual void getUnconstrainedPosition(Point3F& pos);
virtual void getUnconstrainedTransform(MatrixF& xfm);
void getUnconstrainedPosition(Point3F& pos) override;
void getUnconstrainedTransform(MatrixF& xfm) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -149,12 +149,12 @@ class afxEA_PlayerPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PlayerPuppetDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_PlayerPuppet; }
afxEffectWrapper* create() const override { return new afxEA_PlayerPuppet; }
};
afxEA_PlayerPuppetDesc afxEA_PlayerPuppetDesc::desc;

28
Engine/source/afx/ea/afxEA_PointLight_T3D.cpp
View file

@ -51,15 +51,15 @@ public:
/*C*/ afxEA_T3DPointLight();
/*D*/ ~afxEA_T3DPointLight();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getBaseColor(LinearColorF& color);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getBaseColor(LinearColorF& color) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -123,7 +123,7 @@ public:
mLight->setColor(live_color);
}
void submitLights(LightManager* lm, bool staticLighting)
void submitLights(LightManager* lm, bool staticLighting) override
{
if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
{
@ -265,12 +265,12 @@ class afxEA_T3DPointLightDesc : public afxEffectAdapterDesc, public afxEffectDef
static afxEA_T3DPointLightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_T3DPointLight; }
afxEffectWrapper* create() const override { return new afxEA_T3DPointLight; }
};
afxEA_T3DPointLightDesc afxEA_T3DPointLightDesc::desc;

22
Engine/source/afx/ea/afxEA_Projectile.cpp
View file

@ -56,14 +56,14 @@ public:
/*C*/ afxEA_Projectile();
/*D*/ ~afxEA_Projectile();
virtual bool isDone();
bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -268,12 +268,12 @@ class afxEA_ProjectileDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ProjectileDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Projectile; }
afxEffectWrapper* create() const override { return new afxEA_Projectile; }
};
afxEA_ProjectileDesc afxEA_ProjectileDesc::desc;

22
Engine/source/afx/ea/afxEA_ScriptEvent.cpp
View file

@ -46,12 +46,12 @@ public:
/*C*/ afxEA_ScriptEvent();
/*D*/ ~afxEA_ScriptEvent();
virtual bool isDone() { return ran_script; }
bool isDone() override { return ran_script; }
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -126,13 +126,13 @@ class afxEA_ScriptEventDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ScriptEventDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_ScriptEvent; }
afxEffectWrapper* create() const override { return new afxEA_ScriptEvent; }
};
afxEA_ScriptEventDesc afxEA_ScriptEventDesc::desc;

24
Engine/source/afx/ea/afxEA_Sound.cpp
View file

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_Sound();
/*D*/ ~afxEA_Sound();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,13 +153,13 @@ class afxEA_SoundDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_SoundDesc mDesc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual void prepEffect(afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
void prepEffect(afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Sound; }
afxEffectWrapper* create() const override { return new afxEA_Sound; }
};
afxEA_SoundDesc afxEA_SoundDesc::mDesc;

28
Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp
View file

@ -51,15 +51,15 @@ public:
/*C*/ afxEA_T3DSpotLight();
/*D*/ ~afxEA_T3DSpotLight();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getBaseColor(LinearColorF& color);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getBaseColor(LinearColorF& color) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -128,7 +128,7 @@ public:
mLight->setColor(live_color);
}
void submitLights(LightManager* lm, bool staticLighting)
void submitLights(LightManager* lm, bool staticLighting) override
{
if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
{
@ -269,12 +269,12 @@ class afxEA_T3DSpotLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_T3DSpotLightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_T3DSpotLight; }
afxEffectWrapper* create() const override { return new afxEA_T3DSpotLight; }
};
afxEA_T3DSpotLightDesc afxEA_T3DSpotLightDesc::desc;

28
Engine/source/afx/ea/afxEA_StaticShape.cpp
View file

@ -48,16 +48,16 @@ public:
/*C*/ afxEA_StaticShape();
/*D*/ ~afxEA_StaticShape();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual TSShape* getTSShape();
virtual TSShapeInstance* getTSShapeInstance();
void getUpdatedBoxCenter(Point3F& pos) override;
TSShape* getTSShape() override;
TSShapeInstance* getTSShapeInstance() override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -222,12 +222,12 @@ class afxEA_StaticShapeDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_StaticShapeDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_StaticShape; }
afxEffectWrapper* create() const override { return new afxEA_StaticShape; }
};
afxEA_StaticShapeDesc afxEA_StaticShapeDesc::desc;

10
Engine/source/afx/ea/afxEA_TLKLight.cpp
View file

@ -53,12 +53,12 @@ class afxEA_TLKLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_TLKLightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_TLKLightDesc afxEA_TLKLightDesc::desc;

10
Engine/source/afx/ea/afxEA_VolumeLight.cpp
View file

@ -38,12 +38,12 @@ class afxEA_VolumeLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_VolumeLightDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_VolumeLightDesc afxEA_VolumeLightDesc::desc;

22
Engine/source/afx/ea/afxEA_Zodiac.cpp
View file

@ -65,14 +65,14 @@ public:
/*C*/ afxEA_Zodiac();
/*C*/ ~afxEA_Zodiac();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; }
void getBaseColor(LinearColorF& color) override { color = zode_data->color; }
static void initPersistFields();
@ -412,12 +412,12 @@ class afxEA_ZodiacDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Zodiac; }
afxEffectWrapper* create() const override { return new afxEA_Zodiac; }
};
afxEA_ZodiacDesc afxEA_ZodiacDesc::desc;

26
Engine/source/afx/ea/afxEA_ZodiacPlane.cpp
View file

@ -58,14 +58,14 @@ public:
/*C*/ afxEA_ZodiacPlane();
/*D*/ ~afxEA_ZodiacPlane();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; }
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getUpdatedBoxCenter(Point3F& pos) override;
void getBaseColor(LinearColorF& color) override { color = zode_data->color; }
};
F32 afxEA_ZodiacPlane::calc_facing_angle()
@ -319,12 +319,12 @@ class afxEA_ZodiacPlaneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacPlaneDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_ZodiacPlane; }
afxEffectWrapper* create() const override { return new afxEA_ZodiacPlane; }
};
//~~~~~~~~~~~~~~~~~~~~//

18
Engine/source/afx/forces/afxEA_Force.cpp
View file

@ -47,10 +47,10 @@ public:
/*C*/ afxEA_Force();
/*D*/ ~afxEA_Force();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -155,12 +155,12 @@ class afxEA_ForceDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ForceDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Force; }
afxEffectWrapper* create() const override { return new afxEA_Force; }
};
afxEA_ForceDesc afxEA_ForceDesc::desc;

16
Engine/source/afx/forces/afxF_Drag.cpp
View file

@ -43,9 +43,9 @@ public:
/*C*/ afxF_DragData();
/*C*/ afxF_DragData(const afxF_DragData&, bool = false);
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
static void initPersistFields();
@ -65,10 +65,10 @@ private:
public:
/*C*/ afxF_Drag();
virtual bool onNewDataBlock(afxForceData* dptr, bool reload);
bool onNewDataBlock(afxForceData* dptr, bool reload) override;
virtual void start();
virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass);
void start() override;
Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -196,8 +196,8 @@ class afxF_DragDesc : public afxForceDesc
static afxF_DragDesc desc;
public:
virtual bool testForceType(const SimDataBlock*) const;
virtual afxForce* create() const { return new afxF_Drag; }
bool testForceType(const SimDataBlock*) const override;
afxForce* create() const override { return new afxF_Drag; }
};
afxF_DragDesc afxF_DragDesc::desc;

14
Engine/source/afx/forces/afxF_Gravity.cpp
View file

@ -41,9 +41,9 @@ public:
/*C*/ afxF_GravityData();
/*C*/ afxF_GravityData(const afxF_GravityData&, bool = false);
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
static void initPersistFields();
@ -62,9 +62,9 @@ private:
public:
/*C*/ afxF_Gravity();
virtual bool onNewDataBlock(afxForceData* dptr, bool reload);
bool onNewDataBlock(afxForceData* dptr, bool reload) override;
virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass);
Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -158,8 +158,8 @@ class afxF_GravityDesc : public afxForceDesc
static afxF_GravityDesc desc;
public:
virtual bool testForceType(const SimDataBlock*) const;
virtual afxForce* create() const { return new afxF_Gravity; }
bool testForceType(const SimDataBlock*) const override;
afxForce* create() const override { return new afxF_Gravity; }
};
afxF_GravityDesc afxF_GravityDesc::desc;

8
Engine/source/afx/forces/afxForce.h
View file

@ -42,11 +42,11 @@ public:
/*C*/ afxForceData();
/*C*/ afxForceData(const afxForceData&, bool = false);
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;
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0)=0;
static void initPersistFields();

14
Engine/source/afx/forces/afxXM_Force.cpp
View file

@ -52,16 +52,16 @@ public:
/*C*/ afxXM_ForceData();
/*C*/ afxXM_ForceData(const afxXM_ForceData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_ForceData);
};
@ -85,8 +85,8 @@ class afxXM_Force : public afxXM_WeightedBase, public afxEffectDefs
public:
/*C*/ afxXM_Force(afxXM_ForceData*, afxEffectWrapper*);
virtual void start(F32 timestamp);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void start(F32 timestamp) override;
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

6
Engine/source/afx/rpg/afxRPGMagicSpell.h
View file

@ -90,9 +90,9 @@ public:
char* formatDesc(char* buffer, int len) const;
bool requiresTarget() { return (spell_target == TARGET_ENEMY || spell_target == TARGET_CORPSE || spell_target == TARGET_FRIEND); }
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();

24
Engine/source/afx/ui/afxEventCatchAll.cpp
View file

@ -34,21 +34,21 @@ class afxEventCatchAll : public GuiControl
public:
/* C */ afxEventCatchAll() { }
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
virtual void onMouseUp(const GuiEvent&);
virtual void onMouseDown(const GuiEvent&);
virtual void onMouseMove(const GuiEvent&);
virtual void onMouseDragged(const GuiEvent&);
virtual void onMouseEnter(const GuiEvent&);
virtual void onMouseLeave(const GuiEvent&);
void onMouseUp(const GuiEvent&) override;
void onMouseDown(const GuiEvent&) override;
void onMouseMove(const GuiEvent&) override;
void onMouseDragged(const GuiEvent&) override;
void onMouseEnter(const GuiEvent&) override;
void onMouseLeave(const GuiEvent&) override;
virtual bool onMouseWheelUp(const GuiEvent&);
virtual bool onMouseWheelDown(const GuiEvent&);
bool onMouseWheelUp(const GuiEvent&) override;
bool onMouseWheelDown(const GuiEvent&) override;
virtual void onRightMouseDown(const GuiEvent&);
virtual void onRightMouseUp(const GuiEvent&);
virtual void onRightMouseDragged(const GuiEvent&);
void onRightMouseDown(const GuiEvent&) override;
void onRightMouseUp(const GuiEvent&) override;
void onRightMouseDragged(const GuiEvent&) override;
DECLARE_CONOBJECT(afxEventCatchAll);
DECLARE_CATEGORY("AFX");

14
Engine/source/afx/ui/afxGuiSubstitutionField.h
View file

@ -43,21 +43,21 @@ public:
DECLARE_CONOBJECT(afxGuiSubstitutionField);
DECLARE_CATEGORY("AFX");
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateValue();
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateValue() override;
virtual void setToolTip( StringTableEntry data );
virtual bool onAdd();
bool onAdd() override;
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
virtual void setValue( const char* newValue );
void setValue( const char* newValue ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

2
Engine/source/afx/ui/afxGuiTextHud.h
View file

@ -72,7 +72,7 @@ public:
afxGuiTextHud();
// GuiControl
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();
static void addTextItem(const Point3F& pos, const char* text, LinearColorF& color, SceneObject* obj=0);

16
Engine/source/afx/ui/afxSpellButton.h
View file

@ -82,15 +82,15 @@ public:
afxMagicSpellData* getSpellDataBlock() const;
afxRPGMagicSpellData* getSpellRPGDataBlock() const;
virtual bool onAdd();
virtual bool onWake();
virtual void onSleep();
virtual void inspectPostApply();
virtual void onMouseEnter(const GuiEvent &event);
virtual void onMouseLeave(const GuiEvent &event);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onAdd() override;
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
void onMouseEnter(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
static void initPersistFields();

6
Engine/source/afx/ui/afxSpellCastBar.cpp
View file

@ -50,13 +50,13 @@ class afxSpellCastBar : public GuiControl, public afxProgressBase
public:
/*C*/ afxSpellCastBar();
virtual void onRender(Point2I, const RectI&);
void onRender(Point2I, const RectI&) override;
void setFraction(F32 frac);
F32 getFraction() const { return fraction; }
virtual void setProgress(F32 value) { setFraction(value); }
virtual void onStaticModified(const char* slotName, const char* newValue = NULL);
void setProgress(F32 value) override { setFraction(value); }
void onStaticModified(const char* slotName, const char* newValue = NULL) override;
static void initPersistFields();

12
Engine/source/afx/ui/afxStatusBar.cpp
View file

@ -49,20 +49,20 @@ class afxStatusBar : public GuiControl, public afxProgressBase
public:
/*C*/ afxStatusBar();
virtual void onRender(Point2I, const RectI&);
void onRender(Point2I, const RectI&) override;
void setFraction(F32 frac);
F32 getFraction() const { return fraction; }
virtual void setProgress(F32 value) { setFraction(value); }
void setProgress(F32 value) override { setFraction(value); }
void setShape(ShapeBase* s);
void clearShape() { setShape(NULL); }
virtual bool onWake();
virtual void onSleep();
virtual void onMouseDown(const GuiEvent &event);
virtual void onDeleteNotify(SimObject*);
bool onWake() override;
void onSleep() override;
void onMouseDown(const GuiEvent &event) override;
void onDeleteNotify(SimObject*) override;
static void initPersistFields();

Some files were not shown because too many files have changed in this diff Show more