TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rest of virtuals removed

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

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(); ExtendedMove();
virtual void pack(BitStream *stream, const Move * move = NULL); void pack(BitStream *stream, const Move * move = NULL) override;
virtual void unpack(BitStream *stream, const Move * move = NULL); void unpack(BitStream *stream, const Move * move = NULL) override;
virtual void clamp(); void clamp() override;
virtual void unclamp(); void unclamp() override;
}; };
extern const ExtendedMove NullExtendedMove; extern const ExtendedMove NullExtendedMove;

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

@ -52,8 +52,8 @@ struct afxCameraData: public ShapeBaseData {
// //
DECLARE_CONOBJECT(afxCameraData); DECLARE_CONOBJECT(afxCameraData);
static void initPersistFields(); static void initPersistFields();
virtual void packData(BitStream* stream); void packData(BitStream* stream) override;
virtual void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
}; };
@ -140,7 +140,7 @@ public:
void setThirdPersonSnapClient(); void setThirdPersonSnapClient();
const char* getMode(); const char* getMode();
bool isCamera() const { return true; } bool isCamera() const override { return true; }
DECLARE_CONOBJECT(afxCamera); DECLARE_CONOBJECT(afxCamera);
DECLARE_CATEGORY("UNLISTED"); DECLARE_CATEGORY("UNLISTED");
@ -151,35 +151,35 @@ private: // 3POV SECTION
bool test_blocked_line(const Point3F& start, const Point3F& end); bool test_blocked_line(const Point3F& start, const Point3F& end);
public: // STD OVERRIDES SECTION public: // STD OVERRIDES SECTION
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
virtual void onDeleteNotify(SimObject *obj); void onDeleteNotify(SimObject *obj) override;
virtual void advanceTime(F32 dt); void advanceTime(F32 dt) override;
virtual void processTick(const Move* move); void processTick(const Move* move) override;
virtual void interpolateTick(F32 delta); void interpolateTick(F32 delta) override;
virtual void writePacketData(GameConnection *conn, BitStream *stream); void writePacketData(GameConnection *conn, BitStream *stream) override;
virtual void readPacketData(GameConnection *conn, BitStream *stream); void readPacketData(GameConnection *conn, BitStream *stream) override;
virtual U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
virtual void unpackUpdate(NetConnection *conn, BitStream *stream); void unpackUpdate(NetConnection *conn, BitStream *stream) override;
virtual void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*); void onCameraScopeQuery(NetConnection* cr, CameraScopeQuery*) override;
virtual void getCameraTransform(F32* pos,MatrixF* mat); void getCameraTransform(F32* pos,MatrixF* mat) override;
virtual void setTransform(const MatrixF& mat); void setTransform(const MatrixF& mat) override;
virtual void onEditorEnable(); void onEditorEnable() override;
virtual void onEditorDisable(); void onEditorDisable() override;
virtual F32 getCameraFov(); F32 getCameraFov() override;
virtual F32 getDefaultCameraFov(); F32 getDefaultCameraFov() override;
virtual bool isValidCameraFov(F32 fov); bool isValidCameraFov(F32 fov) override;
virtual void setCameraFov(F32 fov); void setCameraFov(F32 fov) override;
virtual F32 getDamageFlash() const; F32 getDamageFlash() const override;
virtual F32 getWhiteOut() const; 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();
/*C*/ afxChoreographerData(const afxChoreographerData&, bool = false); /*C*/ afxChoreographerData(const afxChoreographerData&, bool = false);
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr); bool preload(bool server, String &errorStr) override;
static void initPersistFields(); static void initPersistFields();
@ -137,12 +137,12 @@ public:
static void initPersistFields(); static void initPersistFields();
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
virtual U32 packUpdate(NetConnection*, U32, BitStream*); U32 packUpdate(NetConnection*, U32, BitStream*) override;
virtual void unpackUpdate(NetConnection*, BitStream*); void unpackUpdate(NetConnection*, BitStream*) override;
virtual void sync_with_clients() { } virtual void sync_with_clients() { }
@ -196,7 +196,7 @@ public:
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
// missile watcher callbacks // missile watcher callbacks
public: 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_CONOBJECT(afxChoreographer);
DECLARE_CATEGORY("UNLISTED"); DECLARE_CATEGORY("UNLISTED");

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

@ -278,14 +278,14 @@ public:
virtual ~afxPointConstraint(); virtual ~afxPointConstraint();
virtual void set(Point3F point, Point3F vector); 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; } SceneObject* getSceneObject() override { return 0; }
virtual void restoreObject(SceneObject*) { } void restoreObject(SceneObject*) override { }
virtual U16 getScopeId() { return 0; } U16 getScopeId() override { return 0; }
virtual U32 getTriggers() { 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 ~afxTransformConstraint();
virtual void set(const MatrixF& xfm); 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; } SceneObject* getSceneObject() override { return 0; }
virtual void restoreObject(SceneObject*) { } void restoreObject(SceneObject*) override { }
virtual U16 getScopeId() { return 0; } U16 getScopeId() override { return 0; }
virtual U32 getTriggers() { 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 ~afxShapeConstraint();
virtual void set(ShapeBase* shape); virtual void set(ShapeBase* shape);
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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); U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
virtual void resetAnimation(U32 tag); void resetAnimation(U32 tag) override;
virtual U32 lockAnimation(); U32 lockAnimation() override;
virtual void unlockAnimation(U32 tag); void unlockAnimation(U32 tag) override;
virtual F32 getAnimClipDuration(const char* clip); F32 getAnimClipDuration(const char* clip) override;
void remapAnimation(U32 tag, ShapeBase* other_shape); void remapAnimation(U32 tag, ShapeBase* other_shape);
virtual S32 getDamageState(); S32 getDamageState() override;
virtual SceneObject* getSceneObject() { return mShape; } SceneObject* getSceneObject() override { return mShape; }
virtual void restoreObject(SceneObject*); void restoreObject(SceneObject*) override;
virtual U16 getScopeId() { return mScope_id; } U16 getScopeId() override { return mScope_id; }
virtual U32 getTriggers(); 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*);
/*C*/ afxShapeNodeConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node); /*C*/ afxShapeNodeConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
virtual void set(ShapeBase* shape); void set(ShapeBase* shape) override;
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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 void restoreObject(SceneObject*); void restoreObject(SceneObject*) override;
S32 getNodeID() const { return mShape_node_ID; } S32 getNodeID() const { return mShape_node_ID; }
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -415,17 +415,17 @@ public:
virtual ~afxObjectConstraint(); virtual ~afxObjectConstraint();
virtual void set(SceneObject* obj); virtual void set(SceneObject* obj);
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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 mObj; } SceneObject* getSceneObject() override { return mObj; }
virtual void restoreObject(SceneObject*); void restoreObject(SceneObject*) override;
virtual U16 getScopeId() { return mScope_id; } U16 getScopeId() override { return mScope_id; }
virtual U32 getTriggers(); 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); /*C*/ afxEffectConstraint(afxConstraintMgr*, StringTableEntry effect_name);
virtual ~afxEffectConstraint(); virtual ~afxEffectConstraint();
virtual bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
virtual bool getAltitudes(F32& terrain_alt, F32& interior_alt); bool getAltitudes(F32& terrain_alt, F32& interior_alt) override;
virtual void set(afxEffectWrapper* effect); 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); U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans, bool is_death_anim) override;
virtual void resetAnimation(U32 tag); void resetAnimation(U32 tag) override;
virtual F32 getAnimClipDuration(const char* clip); F32 getAnimClipDuration(const char* clip) override;
virtual SceneObject* getSceneObject() { return 0; } SceneObject* getSceneObject() override { return 0; }
virtual void restoreObject(SceneObject*) { } void restoreObject(SceneObject*) override { }
virtual U16 getScopeId() { return 0; } U16 getScopeId() override { return 0; }
virtual U32 getTriggers(); U32 getTriggers() override;
virtual void unset() { set(0); } void unset() override { set(0); }
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -487,10 +487,10 @@ public:
/*C*/ afxEffectNodeConstraint(afxConstraintMgr*); /*C*/ afxEffectNodeConstraint(afxConstraintMgr*);
/*C*/ afxEffectNodeConstraint(afxConstraintMgr*, StringTableEntry name, StringTableEntry node); /*C*/ afxEffectNodeConstraint(afxConstraintMgr*, StringTableEntry name, StringTableEntry node);
virtual bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); 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; } S32 getNodeID() const { return mEffect_node_ID; }
}; };
@ -532,14 +532,14 @@ class afxSampleXfmBuffer : public afxSampleBuffer
protected: protected:
MatrixF* mXfm_buffer; MatrixF* mXfm_buffer;
virtual void recSample(U32 idx, void* data); void recSample(U32 idx, void* data) override;
public: public:
/*C*/ afxSampleXfmBuffer(); /*C*/ afxSampleXfmBuffer();
virtual ~afxSampleXfmBuffer(); virtual ~afxSampleXfmBuffer();
virtual void configHistory(F32 hist_len, U8 sample_rate); void configHistory(F32 hist_len, U8 sample_rate) override;
virtual void getSample(F32 lag, void* data, bool& oob); void getSample(F32 lag, void* data, bool& oob) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -558,11 +558,11 @@ public:
/*C*/ afxPointHistConstraint(afxConstraintMgr*); /*C*/ afxPointHistConstraint(afxConstraintMgr*);
virtual ~afxPointHistConstraint(); virtual ~afxPointHistConstraint();
virtual void set(Point3F point, Point3F vector); void set(Point3F point, Point3F vector) override;
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 bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -581,11 +581,11 @@ public:
/*C*/ afxTransformHistConstraint(afxConstraintMgr*); /*C*/ afxTransformHistConstraint(afxConstraintMgr*);
virtual ~afxTransformHistConstraint(); virtual ~afxTransformHistConstraint();
virtual void set(const MatrixF& xfm); void set(const MatrixF& xfm) override;
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 bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); bool getTransform(MatrixF& xfm, F32 hist=0.0f) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -605,14 +605,14 @@ public:
/*C*/ afxShapeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name); /*C*/ afxShapeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
virtual ~afxShapeHistConstraint(); virtual ~afxShapeHistConstraint();
virtual void set(ShapeBase* shape); void set(ShapeBase* shape) override;
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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 bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); 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); /*C*/ afxShapeNodeHistConstraint(afxConstraintMgr*, StringTableEntry arb_name, StringTableEntry arb_node);
virtual ~afxShapeNodeHistConstraint(); virtual ~afxShapeNodeHistConstraint();
virtual void set(ShapeBase* shape); void set(ShapeBase* shape) override;
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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 bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); 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); afxObjectHistConstraint(afxConstraintMgr*, StringTableEntry arb_name);
virtual ~afxObjectHistConstraint(); virtual ~afxObjectHistConstraint();
virtual void set(SceneObject* obj); void set(SceneObject* obj) override;
virtual void set_scope_id(U16 scope_id); void set_scope_id(U16 scope_id) override;
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 bool getPosition(Point3F& pos, F32 hist=0.0f); bool getPosition(Point3F& pos, F32 hist=0.0f) override;
virtual bool getTransform(MatrixF& xfm, F32 hist=0.0f); 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; U32 id;
public: public:
egValidator(U32 id) { this->id = id; } egValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr); void validateType(SimObject *object, void *typePtr) override;
}; };
bool do_id_convert; bool do_id_convert;
@ -82,16 +82,16 @@ public:
/*C*/ afxEffectGroupData(); /*C*/ afxEffectGroupData();
/*C*/ afxEffectGroupData(const afxEffectGroupData&, bool = false); /*C*/ afxEffectGroupData(const afxEffectGroupData&, bool = false);
virtual void reloadReset(); void reloadReset() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); 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(); static void initPersistFields();

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

@ -175,7 +175,7 @@ public:
void parse_cons_specs(); void parse_cons_specs();
void parse_vis_keys(); 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 pack_mods(BitStream*, afxXM_BaseData* mods[], bool packed);
void unpack_mods(BitStream*, afxXM_BaseData* mods[]); void unpack_mods(BitStream*, afxXM_BaseData* mods[]);
@ -184,13 +184,13 @@ public:
/*C*/ afxEffectWrapperData(const afxEffectWrapperData&, bool = false); /*C*/ afxEffectWrapperData(const afxEffectWrapperData&, bool = false);
/*D*/ ~afxEffectWrapperData(); /*D*/ ~afxEffectWrapperData();
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); 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 requiresStop(const afxEffectTimingData& timing) { return effect_desc->requiresStop(this, timing); }
bool runsOnServer() { return effect_desc->runsOnServer(this); } bool runsOnServer() { return effect_desc->runsOnServer(this); }
@ -201,7 +201,7 @@ public:
F32 afterStopTime() { return ewd_timing.fade_out_time; } F32 afterStopTime() { return ewd_timing.fade_out_time; }
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); 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 class EffectronFinishStartupEvent : public SimEvent
{ {
public: public:
void process(SimObject* obj) void process(SimObject* obj) override
{ {
afxEffectron* eff = dynamic_cast<afxEffectron*>(obj); afxEffectron* eff = dynamic_cast<afxEffectron*>(obj);
if (eff) if (eff)

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

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

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

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

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

@ -61,7 +61,7 @@ class afxMagicMissileData : public GameBaseData
typedef GameBaseData Parent; typedef GameBaseData Parent;
protected: protected:
bool onAdd(); bool onAdd() override;
public: public:
enum { MaxLifetimeTicks = 4095 }; enum { MaxLifetimeTicks = 4095 };
@ -210,10 +210,10 @@ public:
/*C*/ afxMagicMissileData(); /*C*/ afxMagicMissileData();
/*D*/ ~afxMagicMissileData(); /*D*/ ~afxMagicMissileData();
void packData(BitStream*); void packData(BitStream*) override;
void unpackData(BitStream*); void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr); bool preload(bool server, String &errorStr) override;
static void initPersistFields(); static void initPersistFields();
@ -223,7 +223,7 @@ public:
/*C*/ afxMagicMissileData(const afxMagicMissileData&, bool = false); /*C*/ afxMagicMissileData(const afxMagicMissileData&, bool = false);
afxMagicMissileData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); 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); void gather_cons_defs(Vector<afxConstraintDef>& defs);
}; };
@ -290,8 +290,8 @@ protected:
*/ */
// ISceneLight // ISceneLight
virtual void submitLights( LightManager *lm, bool staticLighting ); void submitLights( LightManager *lm, bool staticLighting ) override;
virtual LightInfo* getLight() { return mLight; } LightInfo* getLight() override { return mLight; }
LightInfo *mLight; LightInfo *mLight;
LightState mLightState; LightState mLightState;
@ -319,19 +319,19 @@ protected:
U32 mCollideHitType; U32 mCollideHitType;
*/ */
bool onAdd(); bool onAdd() override;
void onRemove(); void onRemove() override;
bool onNewDataBlock(GameBaseData *dptr, bool reload); bool onNewDataBlock(GameBaseData *dptr, bool reload) override;
// Rendering // Rendering
virtual void prepRenderImage(SceneRenderState*); void prepRenderImage(SceneRenderState*) override;
void prepBatchRender( SceneRenderState *state); void prepBatchRender( SceneRenderState *state);
void processTick(const Move *move); void processTick(const Move *move) override;
/* /*
void advanceTime(F32 dt); void advanceTime(F32 dt);
*/ */
void interpolateTick(F32 delta); void interpolateTick(F32 delta) override;
/* /*
/// What to do once this projectile collides with something /// What to do once this projectile collides with something
@ -355,8 +355,8 @@ protected:
// These are stolen from the player class .. // These are stolen from the player class ..
bool pointInWater(const Point3F &point); bool pointInWater(const Point3F &point);
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream); U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream); void unpackUpdate(NetConnection *conn, BitStream *stream) override;
afxChoreographer* choreographer; afxChoreographer* choreographer;
@ -396,7 +396,7 @@ public:
/*C*/ afxMagicMissile(); /*C*/ afxMagicMissile();
/*C*/ afxMagicMissile(bool on_server, bool on_client); /*C*/ afxMagicMissile(bool on_server, bool on_client);
/*D*/ ~afxMagicMissile(); /*D*/ ~afxMagicMissile();
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
DECLARE_CONOBJECT(afxMagicMissile); DECLARE_CONOBJECT(afxMagicMissile);
DECLARE_CATEGORY("UNLISTED"); 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 class SpellFinishStartupEvent : public SimEvent
{ {
public: public:
void process(SimObject* obj) void process(SimObject* obj) override
{ {
afxMagicSpell* spell = dynamic_cast<afxMagicSpell*>(obj); afxMagicSpell* spell = dynamic_cast<afxMagicSpell*>(obj);
if (spell) if (spell)
@ -574,10 +574,10 @@ class CastingPhrase_C : public afxPhrase
F32 mCastbar_progress; F32 mCastbar_progress;
public: public:
/*C*/ CastingPhrase_C(ShapeBase* caster, bool notify_castbar); /*C*/ CastingPhrase_C(ShapeBase* caster, bool notify_castbar);
virtual void start(F32 startstamp, F32 timestamp); void start(F32 startstamp, F32 timestamp) override;
virtual void update(F32 dt, F32 timestamp); void update(F32 dt, F32 timestamp) override;
virtual void stop(F32 timestamp); void stop(F32 timestamp) override;
virtual void interrupt(F32 timestamp); void interrupt(F32 timestamp) override;
}; };
CastingPhrase_C::CastingPhrase_C(ShapeBase* c, bool notify) 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; U32 id;
public: public:
ewValidator(U32 id) { this->id = id; } ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr); void validateType(SimObject *object, void *typePtr) override;
}; };
bool mDo_id_convert; bool mDo_id_convert;
@ -106,18 +106,18 @@ public:
/*C*/ afxMagicSpellData(); /*C*/ afxMagicSpellData();
/*C*/ afxMagicSpellData(const afxMagicSpellData&, bool = false); /*C*/ afxMagicSpellData(const afxMagicSpellData&, bool = false);
virtual void reloadReset(); void reloadReset() override;
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
virtual bool writeField(StringTableEntry fieldname, const char* value); 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>&); void gatherConstraintDefs(Vector<afxConstraintDef>&);
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); static void initPersistFields();
@ -208,7 +208,7 @@ public:
class ObjectDeleteEvent : public SimEvent class ObjectDeleteEvent : public SimEvent
{ {
public: public:
void process(SimObject *obj) { if (obj) obj->deleteObject(); } void process(SimObject *obj) override { if (obj) obj->deleteObject(); }
}; };
private: private:
@ -272,9 +272,9 @@ private:
bool is_impact_in_water(SceneObject* obj, const Point3F& p); bool is_impact_in_water(SceneObject* obj, const Point3F& p);
protected: protected:
virtual bool remap_builtin_constraint(SceneObject*, const char* cons_name); // CONSTRAINT REMAPPING bool remap_builtin_constraint(SceneObject*, const char* cons_name) override; // CONSTRAINT REMAPPING
virtual void pack_constraint_info(NetConnection* conn, BitStream* stream); void pack_constraint_info(NetConnection* conn, BitStream* stream) override;
virtual void unpack_constraint_info(NetConnection* conn, BitStream* stream); void unpack_constraint_info(NetConnection* conn, BitStream* stream) override;
private: private:
afxMagicMissile* mMissile; afxMagicMissile* mMissile;
@ -292,11 +292,11 @@ private:
void launch_missile_c(); void launch_missile_c();
public: public:
virtual void impactNotify(const Point3F& p, const Point3F& n, SceneObject*); void impactNotify(const Point3F& p, const Point3F& n, SceneObject*) override;
virtual void executeScriptEvent(const char* method, afxConstraint*, void executeScriptEvent(const char* method, afxConstraint*,
const MatrixF& pos, const char* data); const MatrixF& pos, const char* data) override;
virtual void inflictDamage(const char * label, const char* flavor, SimObjectId target, void inflictDamage(const char * label, const char* flavor, SimObjectId target,
F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp); F32 amt, U8 count, F32 ad_amt, F32 rad, Point3F pos, F32 imp) override;
public: public:
/*C*/ afxMagicSpell(); /*C*/ afxMagicSpell();
@ -304,16 +304,16 @@ public:
/*D*/ ~afxMagicSpell(); /*D*/ ~afxMagicSpell();
// STANDARD OVERLOADED METHODS // // STANDARD OVERLOADED METHODS //
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
virtual void processTick(const Move*); void processTick(const Move*) override;
virtual void advanceTime(F32 dt); void advanceTime(F32 dt) override;
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
virtual U32 packUpdate(NetConnection*, U32, BitStream*); U32 packUpdate(NetConnection*, U32, BitStream*) override;
virtual void unpackUpdate(NetConnection*, BitStream*); void unpackUpdate(NetConnection*, BitStream*) override;
virtual void sync_with_clients(); void sync_with_clients() override;
void finish_startup(); void finish_startup();
static void initPersistFields(); static void initPersistFields();
@ -361,7 +361,7 @@ public:
afxMagicMissile* getMissile() const { return mMissile; } afxMagicMissile* getMissile() const { return mMissile; }
SceneObject* getImpactedObject() const { return mImpacted_obj; } SceneObject* getImpactedObject() const { return mImpacted_obj; }
virtual void restoreObject(SceneObject*); void restoreObject(SceneObject*) override;
bool activationCallInit(bool postponed=false); bool activationCallInit(bool postponed=false);
void activate(); void activate();

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

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

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

@ -153,7 +153,7 @@ public:
/*D*/ ~afxResidueMgr(); /*D*/ ~afxResidueMgr();
void cleanup(); void cleanup();
virtual void onDeleteNotify(SimObject *obj); void onDeleteNotify(SimObject *obj) override;
public: public:
void residueAdvanceTime(); 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 class SelectronFinishStartupEvent : public SimEvent
{ {
public: public:
void process(SimObject* obj) void process(SimObject* obj) override
{ {
afxSelectron* selectron = dynamic_cast<afxSelectron*>(obj); afxSelectron* selectron = dynamic_cast<afxSelectron*>(obj);
if (selectron) if (selectron)

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

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

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

@ -57,10 +57,10 @@ public:
public: public:
/*C*/ afxSpellBookData(); /*C*/ afxSpellBookData();
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr); bool preload(bool server, String &errorStr) override;
bool verifyPageSlot(S32 page, S32 slot); bool verifyPageSlot(S32 page, S32 slot);
S32 getPageSlotIndex(S32 page, S32 slot); S32 getPageSlotIndex(S32 page, S32 slot);
@ -104,15 +104,15 @@ public:
/*C*/ afxSpellBook(); /*C*/ afxSpellBook();
/*D*/ ~afxSpellBook(); /*D*/ ~afxSpellBook();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
virtual void processTick(const Move*); void processTick(const Move*) override;
virtual void advanceTime(F32 dt); void advanceTime(F32 dt) override;
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
virtual U32 packUpdate(NetConnection*, U32, BitStream*); U32 packUpdate(NetConnection*, U32, BitStream*) override;
virtual void unpackUpdate(NetConnection*, BitStream*); void unpackUpdate(NetConnection*, BitStream*) override;
static void initPersistFields(); static void initPersistFields();

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

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

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

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

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

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

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

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

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

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

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

@ -61,14 +61,14 @@ public:
/*C*/ afxAnimClipData(); /*C*/ afxAnimClipData();
/*C*/ afxAnimClipData(const afxAnimClipData&, bool = false); /*C*/ afxAnimClipData(const afxAnimClipData&, bool = false);
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
virtual bool writeField(StringTableEntry fieldname, const char* value); 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(); static void initPersistFields();

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

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

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

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

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

@ -48,15 +48,15 @@ public:
static void initPersistFields(); static void initPersistFields();
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream* stream); void packData(BitStream* stream) override;
virtual void unpackData(BitStream* stream); 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); afxAudioBank* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
virtual void onPerformSubstitutions(); void onPerformSubstitutions() override;
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
DECLARE_CONOBJECT(afxAudioBank); DECLARE_CONOBJECT(afxAudioBank);
}; };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -85,12 +85,12 @@ public:
/*C*/ afxModelData(const afxModelData&, bool = false); /*C*/ afxModelData(const afxModelData&, bool = false);
/*D*/ ~afxModelData(); /*D*/ ~afxModelData();
bool preload(bool server, String &errorStr); bool preload(bool server, String &errorStr) override;
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
virtual void onPerformSubstitutions(); void onPerformSubstitutions() override;
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); static void initPersistFields();
@ -130,22 +130,22 @@ private:
protected: protected:
Vector<S32> mCollisionDetails; Vector<S32> mCollisionDetails;
Vector<S32> mLOSDetails; 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*); void renderObject(SceneRenderState*);
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
public: public:
/*C*/ afxModel(); /*C*/ afxModel();
/*D*/ ~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 setFadeAmount(F32 amt) { fade_amt = amt; }
void setSequenceRateFactor(F32 factor); void setSequenceRateFactor(F32 factor);

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

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

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

@ -56,13 +56,13 @@ public:
/*C*/ afxParticleEmitterData(); /*C*/ afxParticleEmitterData();
/*C*/ afxParticleEmitterData(const afxParticleEmitterData&, bool = false); /*C*/ afxParticleEmitterData(const afxParticleEmitterData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
bool onAdd(); 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(); static void initPersistFields();
@ -80,13 +80,13 @@ public:
/*C*/ afxParticleEmitterVectorData(); /*C*/ afxParticleEmitterVectorData();
/*C*/ afxParticleEmitterVectorData(const afxParticleEmitterVectorData&, bool = false); /*C*/ afxParticleEmitterVectorData(const afxParticleEmitterVectorData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
bool onAdd(); 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(); static void initPersistFields();
@ -108,13 +108,13 @@ public:
/*C*/ afxParticleEmitterConeData(); /*C*/ afxParticleEmitterConeData();
/*C*/ afxParticleEmitterConeData(const afxParticleEmitterConeData&, bool = false); /*C*/ afxParticleEmitterConeData(const afxParticleEmitterConeData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
bool onAdd(); 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(); static void initPersistFields();
@ -150,14 +150,14 @@ public:
/*C*/ afxParticleEmitterPathData(); /*C*/ afxParticleEmitterPathData();
/*C*/ afxParticleEmitterPathData(const afxParticleEmitterPathData&, bool = false); /*C*/ afxParticleEmitterPathData(const afxParticleEmitterPathData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
bool onAdd(); bool onAdd() override;
bool preload(bool server, String &errorStr); bool preload(bool server, String &errorStr) override;
virtual void onPerformSubstitutions(); void onPerformSubstitutions() override;
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); static void initPersistFields();
@ -182,13 +182,13 @@ public:
/*C*/ afxParticleEmitterDiscData(); /*C*/ afxParticleEmitterDiscData();
/*C*/ afxParticleEmitterDiscData(const afxParticleEmitterDiscData&, bool = false); /*C*/ afxParticleEmitterDiscData(const afxParticleEmitterDiscData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
bool onAdd(); 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(); static void initPersistFields();
@ -225,7 +225,7 @@ protected:
void afx_emitParticles(const Point3F& start, const Point3F& end, const Point3F& velocity, const U32 numMilliseconds); void afx_emitParticles(const Point3F& start, const Point3F& end, const Point3F& velocity, const U32 numMilliseconds);
void preCompute(const MatrixF& mat); 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_preCompute(const MatrixF& mat)=0;
virtual void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx)=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(); /*C*/ afxParticleEmitter();
/*D*/ ~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; } afxParticleEmitterData* getDataBlock(){ return mDataBlock; }
void setAFXOwner(const SimObject* owner) { afx_owner = owner; } void setAFXOwner(const SimObject* owner) { afx_owner = owner; }
bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
bool onAdd(); bool onAdd() override;
void onRemove(); void onRemove() override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -256,11 +256,11 @@ public:
/*C*/ afxParticleEmitterVector(); /*C*/ afxParticleEmitterVector();
/*D*/ ~afxParticleEmitterVector(); /*D*/ ~afxParticleEmitterVector();
bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected: protected:
void sub_preCompute(const MatrixF& mat); void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt); void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offse, S32 part_idxt) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -278,11 +278,11 @@ public:
/*C*/ afxParticleEmitterCone(); /*C*/ afxParticleEmitterCone();
/*D*/ ~afxParticleEmitterCone(); /*D*/ ~afxParticleEmitterCone();
bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected: protected:
void sub_preCompute(const MatrixF& mat); void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -309,13 +309,13 @@ public:
/*C*/ afxParticleEmitterPath(); /*C*/ afxParticleEmitterPath();
/*D*/ ~afxParticleEmitterPath(); /*D*/ ~afxParticleEmitterPath();
bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected: protected:
bool onAdd(); bool onAdd() override;
void onRemove(); void onRemove() override;
void sub_preCompute(const MatrixF& mat); void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -333,11 +333,11 @@ public:
/*C*/ afxParticleEmitterDisc(); /*C*/ afxParticleEmitterDisc();
/*D*/ ~afxParticleEmitterDisc(); /*D*/ ~afxParticleEmitterDisc();
bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
protected: protected:
void sub_preCompute(const MatrixF& mat); void sub_preCompute(const MatrixF& mat) override;
void sub_addParticle(const Point3F& pos, const Point3F& vel, const U32 age_offset, S32 part_idx); 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; U32 id;
public: public:
ewValidator(U32 id) { this->id = id; } ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr); void validateType(SimObject *object, void *typePtr) override;
}; };
bool do_id_convert; bool do_id_convert;
@ -88,17 +88,17 @@ public:
/*C*/ afxPhraseEffectData(); /*C*/ afxPhraseEffectData();
/*C*/ afxPhraseEffectData(const afxPhraseEffectData&, bool = false); /*C*/ afxPhraseEffectData(const afxPhraseEffectData&, bool = false);
virtual void reloadReset(); void reloadReset() override;
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); 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(); static void initPersistFields();

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

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

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

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

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

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

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

@ -39,11 +39,11 @@ public:
/*C*/ afxT3DPointLightData(); /*C*/ afxT3DPointLightData();
/*C*/ afxT3DPointLightData(const afxT3DPointLightData&, bool = false); /*C*/ afxT3DPointLightData(const afxT3DPointLightData&, bool = false);
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); 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 class afxProjectileDeleteEvent : public SimEvent
{ {
public: public:
void process(SimObject *object) void process(SimObject *object) override
{ {
object->deleteObject(); object->deleteObject();
} }

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

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

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

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

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

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

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

@ -46,10 +46,10 @@ public:
/*C*/ afxStaticShapeData(); /*C*/ afxStaticShapeData();
/*C*/ afxStaticShapeData(const afxStaticShapeData&, bool = false); /*C*/ afxStaticShapeData(const afxStaticShapeData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
virtual bool allowSubstitutions() const { return true; } bool allowSubstitutions() const override { return true; }
static void initPersistFields(); static void initPersistFields();
@ -72,7 +72,7 @@ private:
StringTableEntry mGhost_cons_name; StringTableEntry mGhost_cons_name;
protected: protected:
virtual void prepRenderImage(SceneRenderState*); void prepRenderImage(SceneRenderState*) override;
public: public:
/*C*/ afxStaticShape(); /*C*/ afxStaticShape();
@ -80,10 +80,10 @@ public:
void init(U32 chor_id, StringTableEntry cons_name); void init(U32 chor_id, StringTableEntry cons_name);
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
virtual void advanceTime(F32 dt); void advanceTime(F32 dt) override;
virtual U32 packUpdate(NetConnection*, U32, BitStream*); U32 packUpdate(NetConnection*, U32, BitStream*) override;
virtual void unpackUpdate(NetConnection*, BitStream*); void unpackUpdate(NetConnection*, BitStream*) override;
const char* getShapeFileName() const { return mDataBlock->mShapeAsset->getShapeFileName(); } const char* getShapeFileName() const { return mDataBlock->mShapeAsset->getShapeFileName(); }
void setVisibility(bool flag) { mIs_visible = flag; } 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();
/*C*/ afxZodiacPlaneData(const afxZodiacPlaneData&, bool = false); /*C*/ afxZodiacPlaneData(const afxZodiacPlaneData&, bool = false);
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); 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); F32 calcRotationAngle(F32 elapsed, F32 rate_factor=1.0f);
@ -128,15 +128,15 @@ public:
/*C*/ afxZodiacPlane(); /*C*/ afxZodiacPlane();
/*D*/ ~afxZodiacPlane(); /*D*/ ~afxZodiacPlane();
virtual bool onNewDataBlock(GameBaseData* dptr, bool reload); bool onNewDataBlock(GameBaseData* dptr, bool reload) override;
virtual bool onAdd(); bool onAdd() override;
virtual void onRemove(); void onRemove() override;
void setRadius(F32 rad) { radius = rad; } void setRadius(F32 rad) { radius = rad; }
void setColor(const LinearColorF& clr) { color = clr; } void setColor(const LinearColorF& clr) { color = clr; }
void setVisibility(bool flag) { is_visible = flag; } void setVisibility(bool flag) { is_visible = flag; }
virtual void prepRenderImage(SceneRenderState*); void prepRenderImage(SceneRenderState*) override;
void _renderZodiacPlane(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*); 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();
/*C*/ ~afxEA_AnimClip(); /*C*/ ~afxEA_AnimClip();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -176,13 +176,13 @@ class afxEA_AnimClipDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimClipDesc desc; static afxEA_AnimClipDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; } 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; 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: public:
/*C*/ afxEA_AnimLock(); /*C*/ afxEA_AnimLock();
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -84,13 +84,13 @@ class afxEA_AnimLockDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimLockDesc desc; static afxEA_AnimLockDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; } 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; 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();
/*C*/ ~afxEA_AreaDamage(); /*C*/ ~afxEA_AreaDamage();
virtual bool isDone(); bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -246,12 +246,12 @@ class afxEA_AreaDamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AreaDamageDesc desc; static afxEA_AreaDamageDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } 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; afxEA_AreaDamageDesc afxEA_AreaDamageDesc::desc;

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

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

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

@ -47,14 +47,14 @@ public:
/*C*/ afxEA_Billboard(); /*C*/ afxEA_Billboard();
/*D*/ ~afxEA_Billboard(); /*D*/ ~afxEA_Billboard();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void ea_set_scope_status(bool flag); void ea_set_scope_status(bool flag) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos); void getUpdatedBoxCenter(Point3F& pos) override;
virtual void getBaseColor(LinearColorF& color) { if (bb_data) color = bb_data->color; } 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; static afxEA_BillboardDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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: public:
/*C*/ afxEA_CameraPuppet(); /*C*/ afxEA_CameraPuppet();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void getUnconstrainedPosition(Point3F& pos); void getUnconstrainedPosition(Point3F& pos) override;
virtual void getUnconstrainedTransform(MatrixF& xfm); void getUnconstrainedTransform(MatrixF& xfm) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -164,12 +164,12 @@ class afxEA_CameraPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_CameraPuppetDesc desc; static afxEA_CameraPuppetDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const; bool runsOnServer(const afxEffectWrapperData*) const override;
virtual bool runsOnClient(const afxEffectWrapperData*) const; 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; afxEA_CameraPuppetDesc afxEA_CameraPuppetDesc::desc;

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

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

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

@ -49,13 +49,13 @@ public:
/*C*/ afxEA_CollisionEvent(); /*C*/ afxEA_CollisionEvent();
/*D*/ ~afxEA_CollisionEvent(); /*D*/ ~afxEA_CollisionEvent();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel); void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -201,13 +201,13 @@ class afxEA_CollisionEventDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_CollisionEventDesc desc; static afxEA_CollisionEventDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual bool isPositional(const afxEffectWrapperData*) const { 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; 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: public:
/*C*/ afxEA_ConsoleMessage(); /*C*/ afxEA_ConsoleMessage();
virtual bool isDone() { return displayed; } bool isDone() override { return displayed; }
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -109,13 +109,13 @@ class afxEA_ConsoleMessageDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_ConsoleMessageDesc desc; static afxEA_ConsoleMessageDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; } 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; 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();
/*C*/ ~afxEA_Damage(); /*C*/ ~afxEA_Damage();
virtual bool isDone(); bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -183,12 +183,12 @@ class afxEA_DamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_DamageDesc desc; static afxEA_DamageDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } 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; afxEA_DamageDesc afxEA_DamageDesc::desc;

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

@ -50,14 +50,14 @@ public:
/*C*/ afxEA_Debris(); /*C*/ afxEA_Debris();
/*D*/ ~afxEA_Debris(); /*D*/ ~afxEA_Debris();
virtual bool isDone(); bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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; static afxEA_DebrisDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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: public:
/*C*/ afxEA_Explosion(); /*C*/ afxEA_Explosion();
virtual bool isDone() { return exploded; } bool isDone() override { return exploded; }
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -127,12 +127,12 @@ class afxEA_ExplosionDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ExplosionDesc desc; static afxEA_ExplosionDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; } bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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 set_overrides(Player*);
void clear_overrides(Player*); void clear_overrides(Player*);
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
@ -156,13 +156,13 @@ class afxEA_FootfallSwitchDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_FootfallSwitchDesc desc; static afxEA_FootfallSwitchDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; } 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; 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: public:
/*C*/ afxEA_GuiController(); /*C*/ afxEA_GuiController();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -193,12 +193,12 @@ class afxEA_GuiControllerDesc : public afxEffectAdapterDesc, public afxEffectDef
static afxEA_GuiControllerDesc desc; static afxEA_GuiControllerDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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: public:
/*C*/ afxEA_GuiText(); /*C*/ afxEA_GuiText();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -157,12 +157,12 @@ class afxEA_GuiTextDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_GuiTextDesc desc; static afxEA_GuiTextDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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; static afxEA_LightDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; afxEA_LightDesc afxEA_LightDesc::desc;

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

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

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

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

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

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_ParticleEmitter(); /*C*/ afxEA_ParticleEmitter();
/*D*/ ~afxEA_ParticleEmitter(); /*D*/ ~afxEA_ParticleEmitter();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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(); /*C*/ afxEA_PhraseEffect();
/*D*/ ~afxEA_PhraseEffect(); /*D*/ ~afxEA_PhraseEffect();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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; static afxEA_PhraseEffectDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { 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; afxEA_PhraseEffectDesc afxEA_PhraseEffectDesc::desc;

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

@ -51,12 +51,12 @@ public:
/*C*/ afxEA_PhysicalZone(); /*C*/ afxEA_PhysicalZone();
/*D*/ ~afxEA_PhysicalZone(); /*D*/ ~afxEA_PhysicalZone();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void ea_set_scope_status(bool flag); void ea_set_scope_status(bool flag) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -203,12 +203,12 @@ class afxEA_PhysicalZoneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PhysicalZoneDesc desc; static afxEA_PhysicalZoneDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } 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; 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();
/*C*/ ~afxEA_PlayerMovement(); /*C*/ ~afxEA_PlayerMovement();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -147,12 +147,12 @@ class afxEA_PlayerMovementDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_PlayerMovementDesc desc; static afxEA_PlayerMovementDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } 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; 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: public:
/*C*/ afxEA_PlayerPuppet(); /*C*/ afxEA_PlayerPuppet();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void getUnconstrainedPosition(Point3F& pos); void getUnconstrainedPosition(Point3F& pos) override;
virtual void getUnconstrainedTransform(MatrixF& xfm); void getUnconstrainedTransform(MatrixF& xfm) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -149,12 +149,12 @@ class afxEA_PlayerPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PlayerPuppetDesc desc; static afxEA_PlayerPuppetDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const; bool runsOnServer(const afxEffectWrapperData*) const override;
virtual bool runsOnClient(const afxEffectWrapperData*) const; 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; afxEA_PlayerPuppetDesc afxEA_PlayerPuppetDesc::desc;

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

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

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

@ -56,14 +56,14 @@ public:
/*C*/ afxEA_Projectile(); /*C*/ afxEA_Projectile();
/*D*/ ~afxEA_Projectile(); /*D*/ ~afxEA_Projectile();
virtual bool isDone(); bool isDone() override;
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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; static afxEA_ProjectileDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const; bool runsOnServer(const afxEffectWrapperData*) const override;
virtual bool runsOnClient(const afxEffectWrapperData*) const; 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; afxEA_ProjectileDesc afxEA_ProjectileDesc::desc;

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

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

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

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_Sound(); /*C*/ afxEA_Sound();
/*D*/ ~afxEA_Sound(); /*D*/ ~afxEA_Sound();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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; static afxEA_SoundDesc mDesc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual void prepEffect(afxEffectWrapperData*) const; 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; afxEA_SoundDesc afxEA_SoundDesc::mDesc;

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

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

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

@ -48,16 +48,16 @@ public:
/*C*/ afxEA_StaticShape(); /*C*/ afxEA_StaticShape();
/*D*/ ~afxEA_StaticShape(); /*D*/ ~afxEA_StaticShape();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void ea_set_scope_status(bool flag); void ea_set_scope_status(bool flag) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos); void getUpdatedBoxCenter(Point3F& pos) override;
virtual TSShape* getTSShape(); TSShape* getTSShape() override;
virtual TSShapeInstance* getTSShapeInstance(); TSShapeInstance* getTSShapeInstance() override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -222,12 +222,12 @@ class afxEA_StaticShapeDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_StaticShapeDesc desc; static afxEA_StaticShapeDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; } bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; } 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; 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; static afxEA_TLKLightDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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; static afxEA_VolumeLightDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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();
/*C*/ ~afxEA_Zodiac(); /*C*/ ~afxEA_Zodiac();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); 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(); static void initPersistFields();
@ -412,12 +412,12 @@ class afxEA_ZodiacDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacDesc desc; static afxEA_ZodiacDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; afxEA_ZodiacDesc afxEA_ZodiacDesc::desc;

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

@ -58,14 +58,14 @@ public:
/*C*/ afxEA_ZodiacPlane(); /*C*/ afxEA_ZodiacPlane();
/*D*/ ~afxEA_ZodiacPlane(); /*D*/ ~afxEA_ZodiacPlane();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
virtual void ea_set_scope_status(bool flag); void ea_set_scope_status(bool flag) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos); void getUpdatedBoxCenter(Point3F& pos) override;
virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; } void getBaseColor(LinearColorF& color) override { color = zode_data->color; }
}; };
F32 afxEA_ZodiacPlane::calc_facing_angle() F32 afxEA_ZodiacPlane::calc_facing_angle()
@ -319,12 +319,12 @@ class afxEA_ZodiacPlaneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacPlaneDesc desc; static afxEA_ZodiacPlaneDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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(); /*C*/ afxEA_Force();
/*D*/ ~afxEA_Force(); /*D*/ ~afxEA_Force();
virtual void ea_set_datablock(SimDataBlock*); void ea_set_datablock(SimDataBlock*) override;
virtual bool ea_start(); bool ea_start() override;
virtual bool ea_update(F32 dt); bool ea_update(F32 dt) override;
virtual void ea_finish(bool was_stopped); void ea_finish(bool was_stopped) override;
}; };
//~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//
@ -155,12 +155,12 @@ class afxEA_ForceDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ForceDesc desc; static afxEA_ForceDesc desc;
public: public:
virtual bool testEffectType(const SimDataBlock*) const; bool testEffectType(const SimDataBlock*) const override;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const; bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; } bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; } 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; 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();
/*C*/ afxF_DragData(const afxF_DragData&, bool = false); /*C*/ afxF_DragData(const afxF_DragData&, bool = false);
virtual void packData(BitStream* stream); void packData(BitStream* stream) override;
virtual void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
static void initPersistFields(); static void initPersistFields();
@ -65,10 +65,10 @@ private:
public: public:
/*C*/ afxF_Drag(); /*C*/ afxF_Drag();
virtual bool onNewDataBlock(afxForceData* dptr, bool reload); bool onNewDataBlock(afxForceData* dptr, bool reload) override;
virtual void start(); void start() override;
virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass); Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
}; };
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -196,8 +196,8 @@ class afxF_DragDesc : public afxForceDesc
static afxF_DragDesc desc; static afxF_DragDesc desc;
public: public:
virtual bool testForceType(const SimDataBlock*) const; bool testForceType(const SimDataBlock*) const override;
virtual afxForce* create() const { return new afxF_Drag; } afxForce* create() const override { return new afxF_Drag; }
}; };
afxF_DragDesc afxF_DragDesc::desc; 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();
/*C*/ afxF_GravityData(const afxF_GravityData&, bool = false); /*C*/ afxF_GravityData(const afxF_GravityData&, bool = false);
virtual void packData(BitStream* stream); void packData(BitStream* stream) override;
virtual void unpackData(BitStream* stream); void unpackData(BitStream* stream) override;
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0); afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
static void initPersistFields(); static void initPersistFields();
@ -62,9 +62,9 @@ private:
public: public:
/*C*/ afxF_Gravity(); /*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; static afxF_GravityDesc desc;
public: public:
virtual bool testForceType(const SimDataBlock*) const; bool testForceType(const SimDataBlock*) const override;
virtual afxForce* create() const { return new afxF_Gravity; } afxForce* create() const override { return new afxF_Gravity; }
}; };
afxF_GravityDesc afxF_GravityDesc::desc; afxF_GravityDesc afxF_GravityDesc::desc;

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

@ -42,11 +42,11 @@ public:
/*C*/ afxForceData(); /*C*/ afxForceData();
/*C*/ afxForceData(const afxForceData&, bool = false); /*C*/ afxForceData(const afxForceData&, bool = false);
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream* stream); void packData(BitStream* stream) override;
virtual void unpackData(BitStream* stream); 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; virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0)=0;
static void initPersistFields(); static void initPersistFields();

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

@ -52,16 +52,16 @@ public:
/*C*/ afxXM_ForceData(); /*C*/ afxXM_ForceData();
/*C*/ afxXM_ForceData(const afxXM_ForceData&, bool = false); /*C*/ afxXM_ForceData(const afxXM_ForceData&, bool = false);
void packData(BitStream* stream); void packData(BitStream* stream) override;
void unpackData(BitStream* stream); 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(); static void initPersistFields();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server); afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_ForceData); DECLARE_CONOBJECT(afxXM_ForceData);
}; };
@ -85,8 +85,8 @@ class afxXM_Force : public afxXM_WeightedBase, public afxEffectDefs
public: public:
/*C*/ afxXM_Force(afxXM_ForceData*, afxEffectWrapper*); /*C*/ afxXM_Force(afxXM_ForceData*, afxEffectWrapper*);
virtual void start(F32 timestamp); void start(F32 timestamp) override;
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params); 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; char* formatDesc(char* buffer, int len) const;
bool requiresTarget() { return (spell_target == TARGET_ENEMY || spell_target == TARGET_CORPSE || spell_target == TARGET_FRIEND); } bool requiresTarget() { return (spell_target == TARGET_ENEMY || spell_target == TARGET_CORPSE || spell_target == TARGET_FRIEND); }
virtual bool onAdd(); bool onAdd() override;
virtual void packData(BitStream*); void packData(BitStream*) override;
virtual void unpackData(BitStream*); void unpackData(BitStream*) override;
static void initPersistFields(); static void initPersistFields();

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

@ -34,21 +34,21 @@ class afxEventCatchAll : public GuiControl
public: public:
/* C */ afxEventCatchAll() { } /* 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&); void onMouseUp(const GuiEvent&) override;
virtual void onMouseDown(const GuiEvent&); void onMouseDown(const GuiEvent&) override;
virtual void onMouseMove(const GuiEvent&); void onMouseMove(const GuiEvent&) override;
virtual void onMouseDragged(const GuiEvent&); void onMouseDragged(const GuiEvent&) override;
virtual void onMouseEnter(const GuiEvent&); void onMouseEnter(const GuiEvent&) override;
virtual void onMouseLeave(const GuiEvent&); void onMouseLeave(const GuiEvent&) override;
virtual bool onMouseWheelUp(const GuiEvent&); bool onMouseWheelUp(const GuiEvent&) override;
virtual bool onMouseWheelDown(const GuiEvent&); bool onMouseWheelDown(const GuiEvent&) override;
virtual void onRightMouseDown(const GuiEvent&); void onRightMouseDown(const GuiEvent&) override;
virtual void onRightMouseUp(const GuiEvent&); void onRightMouseUp(const GuiEvent&) override;
virtual void onRightMouseDragged(const GuiEvent&); void onRightMouseDragged(const GuiEvent&) override;
DECLARE_CONOBJECT(afxEventCatchAll); DECLARE_CONOBJECT(afxEventCatchAll);
DECLARE_CATEGORY("AFX"); DECLARE_CATEGORY("AFX");

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

@ -43,21 +43,21 @@ public:
DECLARE_CONOBJECT(afxGuiSubstitutionField); DECLARE_CONOBJECT(afxGuiSubstitutionField);
DECLARE_CATEGORY("AFX"); DECLARE_CATEGORY("AFX");
virtual void setData( const char* data, bool callbacks = true ); void setData( const char* data, bool callbacks = true ) override;
virtual const char* getData( U32 inspectObjectIndex = 0 ); const char* getData( U32 inspectObjectIndex = 0 ) override;
virtual void updateValue(); void updateValue() override;
virtual void setToolTip( StringTableEntry data ); 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: protected:
virtual void _executeSelectedCallback(); void _executeSelectedCallback() override;
protected: protected:

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

@ -72,7 +72,7 @@ public:
afxGuiTextHud(); afxGuiTextHud();
// GuiControl // GuiControl
virtual void onRender(Point2I offset, const RectI &updateRect); void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields(); static void initPersistFields();
static void addTextItem(const Point3F& pos, const char* text, LinearColorF& color, SceneObject* obj=0); 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; afxMagicSpellData* getSpellDataBlock() const;
afxRPGMagicSpellData* getSpellRPGDataBlock() const; afxRPGMagicSpellData* getSpellRPGDataBlock() const;
virtual bool onAdd(); bool onAdd() override;
virtual bool onWake(); bool onWake() override;
virtual void onSleep(); void onSleep() override;
virtual void inspectPostApply(); void inspectPostApply() override;
virtual void onMouseEnter(const GuiEvent &event); void onMouseEnter(const GuiEvent &event) override;
virtual void onMouseLeave(const GuiEvent &event); void onMouseLeave(const GuiEvent &event) override;
virtual void onRender(Point2I offset, const RectI &updateRect); void onRender(Point2I offset, const RectI &updateRect) override;
virtual void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*) override;
static void initPersistFields(); static void initPersistFields();

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

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

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

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

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