mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 07:34:45 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -99,17 +99,17 @@ public:
|
|||
Signal<void(void)> mReloadSignal;
|
||||
|
||||
// Triggers the reload signal.
|
||||
void inspectPostApply();
|
||||
void inspectPostApply() override;
|
||||
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
|
||||
// The derived class should provide the following:
|
||||
DECLARE_CONOBJECT(GameBaseData);
|
||||
DECLARE_CATEGORY("Datablock");
|
||||
GameBaseData();
|
||||
static void initPersistFields();
|
||||
bool preload(bool server, String &errorStr);
|
||||
void unpackData(BitStream* stream);
|
||||
bool preload(bool server, String &errorStr) override;
|
||||
void unpackData(BitStream* stream) override;
|
||||
|
||||
/// @name Callbacks
|
||||
/// @{
|
||||
|
|
@ -256,9 +256,9 @@ public:
|
|||
/// @name Inherited Functionality.
|
||||
/// @{
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
void inspectPostApply();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
void inspectPostApply() override;
|
||||
static void initPersistFields();
|
||||
static void consoleInit();
|
||||
|
||||
|
|
@ -308,7 +308,7 @@ public:
|
|||
/// @}
|
||||
|
||||
// ProcessObject override
|
||||
void processTick( const Move *move );
|
||||
void processTick( const Move *move ) override;
|
||||
|
||||
/// @name GameBase NetFlags & Hifi-Net Interface
|
||||
/// @{
|
||||
|
|
@ -359,10 +359,10 @@ public:
|
|||
/// @name Network
|
||||
/// @see NetObject, NetConnection
|
||||
/// @{
|
||||
void interpolateTick(F32 dt);
|
||||
F32 getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips );
|
||||
U32 packUpdate ( NetConnection *conn, U32 mask, BitStream *stream );
|
||||
void unpackUpdate( NetConnection *conn, BitStream *stream );
|
||||
void interpolateTick(F32 dt) override;
|
||||
F32 getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips ) override;
|
||||
U32 packUpdate ( NetConnection *conn, U32 mask, BitStream *stream ) override;
|
||||
void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
|
||||
|
||||
/// Write state information necessary to perform client side prediction of an object.
|
||||
///
|
||||
|
|
@ -387,7 +387,7 @@ public:
|
|||
///
|
||||
/// @see writePacketData
|
||||
/// @param conn Game connection
|
||||
virtual U32 getPacketDataChecksum( GameConnection *conn );
|
||||
U32 getPacketDataChecksum( GameConnection *conn ) override;
|
||||
///@}
|
||||
|
||||
|
||||
|
|
@ -396,8 +396,8 @@ public:
|
|||
|
||||
public:
|
||||
|
||||
virtual void onMount( SceneObject *obj, S32 node );
|
||||
virtual void onUnmount( SceneObject *obj,S32 node );
|
||||
void onMount( SceneObject *obj, S32 node ) override;
|
||||
void onUnmount( SceneObject *obj,S32 node ) override;
|
||||
|
||||
/// @}
|
||||
|
||||
|
|
@ -405,7 +405,7 @@ public:
|
|||
/// @{
|
||||
|
||||
/// Returns the client controlling this object
|
||||
GameConnection *getControllingClient() { return mControllingClient; }
|
||||
GameConnection *getControllingClient() override { return mControllingClient; }
|
||||
const GameConnection *getControllingClient() const { return mControllingClient; }
|
||||
|
||||
/// Returns the MoveList of the client controlling this object.
|
||||
|
|
@ -466,7 +466,7 @@ private:
|
|||
///
|
||||
void _onDatablockModified();
|
||||
protected:
|
||||
void onScopeIdChange() { setMaskBits(ScopeIdMask); }
|
||||
void onScopeIdChange() override { setMaskBits(ScopeIdMask); }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -149,24 +149,24 @@ public:
|
|||
/// @name Event Handling
|
||||
/// @{
|
||||
|
||||
virtual void onTimedOut();
|
||||
virtual void onConnectTimedOut();
|
||||
virtual void onDisconnect(const char *reason);
|
||||
virtual void onConnectionRejected(const char *reason);
|
||||
virtual void onConnectionEstablished(bool isInitiator);
|
||||
virtual void handleStartupError(const char *errorString);
|
||||
void onTimedOut() override;
|
||||
void onConnectTimedOut() override;
|
||||
void onDisconnect(const char *reason) override;
|
||||
void onConnectionRejected(const char *reason) override;
|
||||
void onConnectionEstablished(bool isInitiator) override;
|
||||
void handleStartupError(const char *errorString) override;
|
||||
/// @}
|
||||
|
||||
/// @name Packet I/O
|
||||
/// @{
|
||||
|
||||
virtual void writeConnectRequest(BitStream *stream);
|
||||
virtual bool readConnectRequest(BitStream *stream, const char **errorString);
|
||||
virtual void writeConnectAccept(BitStream *stream);
|
||||
virtual bool readConnectAccept(BitStream *stream, const char **errorString);
|
||||
void writeConnectRequest(BitStream *stream) override;
|
||||
bool readConnectRequest(BitStream *stream, const char **errorString) override;
|
||||
void writeConnectAccept(BitStream *stream) override;
|
||||
bool readConnectAccept(BitStream *stream, const char **errorString) override;
|
||||
/// @}
|
||||
|
||||
bool canRemoteCreate();
|
||||
bool canRemoteCreate() override;
|
||||
|
||||
void setVisibleGhostDistance(F32 dist);
|
||||
F32 getVisibleGhostDistance();
|
||||
|
|
@ -188,7 +188,7 @@ protected:
|
|||
S32 cameraFov;
|
||||
GamePacketNotify();
|
||||
};
|
||||
PacketNotify *allocNotify();
|
||||
PacketNotify *allocNotify() override;
|
||||
|
||||
bool mControlForceMismatch;
|
||||
|
||||
|
|
@ -223,28 +223,28 @@ protected:
|
|||
/// @name Packet I/O
|
||||
/// @{
|
||||
|
||||
void readPacket (BitStream *bstream);
|
||||
void writePacket (BitStream *bstream, PacketNotify *note);
|
||||
void packetReceived (PacketNotify *note);
|
||||
void packetDropped (PacketNotify *note);
|
||||
void connectionError (const char *errorString);
|
||||
void readPacket (BitStream *bstream) override;
|
||||
void writePacket (BitStream *bstream, PacketNotify *note) override;
|
||||
void packetReceived (PacketNotify *note) override;
|
||||
void packetDropped (PacketNotify *note) override;
|
||||
void connectionError (const char *errorString) override;
|
||||
|
||||
void writeDemoStartBlock (ResizeBitStream *stream);
|
||||
bool readDemoStartBlock (BitStream *stream);
|
||||
void handleRecordedBlock (U32 type, U32 size, void *data);
|
||||
void writeDemoStartBlock (ResizeBitStream *stream) override;
|
||||
bool readDemoStartBlock (BitStream *stream) override;
|
||||
void handleRecordedBlock (U32 type, U32 size, void *data) override;
|
||||
/// @}
|
||||
void ghostWriteExtra(NetObject *,BitStream *);
|
||||
void ghostReadExtra(NetObject *,BitStream *, bool newGhost);
|
||||
void ghostPreRead(NetObject *, bool newGhost);
|
||||
void ghostWriteExtra(NetObject *,BitStream *) override;
|
||||
void ghostReadExtra(NetObject *,BitStream *, bool newGhost) override;
|
||||
void ghostPreRead(NetObject *, bool newGhost) override;
|
||||
|
||||
virtual void onEndGhosting();
|
||||
void onEndGhosting() override;
|
||||
|
||||
public:
|
||||
|
||||
DECLARE_CONOBJECT(GameConnection);
|
||||
void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount);
|
||||
void handleConnectionMessage(U32 message, U32 sequence, U32 ghostCount) override;
|
||||
void preloadDataBlock(SimDataBlock *block);
|
||||
void fileDownloadSegmentComplete();
|
||||
void fileDownloadSegmentComplete() override;
|
||||
void preloadNextDataBlock(bool hadNew);
|
||||
|
||||
static void consoleInit();
|
||||
|
|
@ -253,8 +253,8 @@ public:
|
|||
GameConnection();
|
||||
~GameConnection();
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
static GameConnection *getConnectionToServer()
|
||||
{
|
||||
|
|
@ -362,8 +362,8 @@ public:
|
|||
bool isFirstPerson() const { return mCameraPos == 0; }
|
||||
bool isAIControlled() { return mAIControlled; }
|
||||
|
||||
void doneScopingScene();
|
||||
void demoPlaybackComplete();
|
||||
void doneScopingScene() override;
|
||||
void demoPlaybackComplete() override;
|
||||
|
||||
void setMissionCRC(U32 crc) { mMissionCRC = crc; }
|
||||
U32 getMissionCRC() { return(mMissionCRC); }
|
||||
|
|
@ -399,7 +399,7 @@ private:
|
|||
bool mChangedSelectedObj;
|
||||
U32 mPreSelectTimestamp;
|
||||
protected:
|
||||
virtual void onDeleteNotify(SimObject*);
|
||||
void onDeleteNotify(SimObject*) override;
|
||||
public:
|
||||
void setRolloverObj(SceneObject*);
|
||||
SceneObject* getRolloverObj() { return mRolloverObj; }
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
class QuitEvent : public SimEvent
|
||||
{
|
||||
void process(SimObject *object)
|
||||
void process(SimObject *object) override
|
||||
{
|
||||
Platform::postQuitMessage(0);
|
||||
}
|
||||
|
|
@ -91,11 +91,11 @@ class SimDataBlockEvent : public NetEvent
|
|||
SimDataBlockEvent(SimDataBlock* obj = NULL, U32 index = 0, U32 total = 0, U32 missionSequence = 0);
|
||||
~SimDataBlockEvent();
|
||||
|
||||
void pack(NetConnection *, BitStream *bstream);
|
||||
void write(NetConnection *, BitStream *bstream);
|
||||
void unpack(NetConnection *cptr, BitStream *bstream);
|
||||
void process(NetConnection*);
|
||||
void notifyDelivered(NetConnection *, bool);
|
||||
void pack(NetConnection *, BitStream *bstream) override;
|
||||
void write(NetConnection *, BitStream *bstream) override;
|
||||
void unpack(NetConnection *cptr, BitStream *bstream) override;
|
||||
void process(NetConnection*) override;
|
||||
void notifyDelivered(NetConnection *, bool) override;
|
||||
|
||||
#ifdef TORQUE_DEBUG_NET
|
||||
const char *getDebugName();
|
||||
|
|
@ -115,10 +115,10 @@ public:
|
|||
typedef NetEvent Parent;
|
||||
|
||||
SimSoundAssetEvent(StringTableEntry assetId = StringTable->EmptyString(), const MatrixF* mat = NULL);
|
||||
void pack(NetConnection*, BitStream* bstream);
|
||||
void write(NetConnection*, BitStream* bstream);
|
||||
void unpack(NetConnection*, BitStream* bstream);
|
||||
void process(NetConnection*);
|
||||
void pack(NetConnection*, BitStream* bstream) override;
|
||||
void write(NetConnection*, BitStream* bstream) override;
|
||||
void unpack(NetConnection*, BitStream* bstream) override;
|
||||
void process(NetConnection*) override;
|
||||
DECLARE_CONOBJECT(SimSoundAssetEvent);
|
||||
};
|
||||
|
||||
|
|
@ -130,10 +130,10 @@ class Sim2DAudioEvent: public NetEvent
|
|||
public:
|
||||
typedef NetEvent Parent;
|
||||
Sim2DAudioEvent(SFXProfile *profile=NULL);
|
||||
void pack(NetConnection *, BitStream *bstream);
|
||||
void write(NetConnection *, BitStream *bstream);
|
||||
void unpack(NetConnection *, BitStream *bstream);
|
||||
void process(NetConnection *);
|
||||
void pack(NetConnection *, BitStream *bstream) override;
|
||||
void write(NetConnection *, BitStream *bstream) override;
|
||||
void unpack(NetConnection *, BitStream *bstream) override;
|
||||
void process(NetConnection *) override;
|
||||
DECLARE_CONOBJECT(Sim2DAudioEvent);
|
||||
};
|
||||
|
||||
|
|
@ -146,10 +146,10 @@ class Sim3DAudioEvent: public NetEvent
|
|||
public:
|
||||
typedef NetEvent Parent;
|
||||
Sim3DAudioEvent(SFXProfile *profile=NULL,const MatrixF* mat=NULL);
|
||||
void pack(NetConnection *, BitStream *bstream);
|
||||
void write(NetConnection *, BitStream *bstream);
|
||||
void unpack(NetConnection *, BitStream *bstream);
|
||||
void process(NetConnection *);
|
||||
void pack(NetConnection *, BitStream *bstream) override;
|
||||
void write(NetConnection *, BitStream *bstream) override;
|
||||
void unpack(NetConnection *, BitStream *bstream) override;
|
||||
void process(NetConnection *) override;
|
||||
DECLARE_CONOBJECT(Sim3DAudioEvent);
|
||||
};
|
||||
|
||||
|
|
@ -166,13 +166,13 @@ class SetMissionCRCEvent : public NetEvent
|
|||
typedef NetEvent Parent;
|
||||
SetMissionCRCEvent(U32 crc = 0xffffffff)
|
||||
{ mCrc = crc; }
|
||||
void pack(NetConnection *, BitStream * bstream)
|
||||
void pack(NetConnection *, BitStream * bstream) override
|
||||
{ bstream->write(mCrc); }
|
||||
void write(NetConnection * con, BitStream * bstream)
|
||||
void write(NetConnection * con, BitStream * bstream) override
|
||||
{ pack(con, bstream); }
|
||||
void unpack(NetConnection *, BitStream * bstream)
|
||||
void unpack(NetConnection *, BitStream * bstream) override
|
||||
{ bstream->read(&mCrc); }
|
||||
void process(NetConnection * con)
|
||||
void process(NetConnection * con) override
|
||||
{ static_cast<GameConnection*>(con)->setMissionCRC(mCrc); }
|
||||
|
||||
DECLARE_CONOBJECT(SetMissionCRCEvent);
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
ClientProcessList();
|
||||
|
||||
// ProcessList
|
||||
void addObject( ProcessObject *pobj );
|
||||
void addObject( ProcessObject *pobj ) override;
|
||||
|
||||
/// Called after a correction packet is received from the server.
|
||||
/// If the control object was corrected it will now play back any moves
|
||||
|
|
@ -57,7 +57,7 @@ public:
|
|||
protected:
|
||||
|
||||
// ProcessList
|
||||
void onPreTickObject( ProcessObject *pobj );
|
||||
void onPreTickObject( ProcessObject *pobj ) override;
|
||||
|
||||
/// Returns true if backlogged.
|
||||
bool doBacklogged( SimTime timeDelta );
|
||||
|
|
@ -77,15 +77,15 @@ public:
|
|||
ServerProcessList();
|
||||
|
||||
// ProcessList
|
||||
void addObject( ProcessObject *pobj );
|
||||
void addObject( ProcessObject *pobj ) override;
|
||||
|
||||
static ServerProcessList* get() { return smServerProcessList; }
|
||||
|
||||
protected:
|
||||
|
||||
// ProcessList
|
||||
void onPreTickObject( ProcessObject *pobj );
|
||||
void advanceObjects();
|
||||
void onPreTickObject( ProcessObject *pobj ) override;
|
||||
void advanceObjects() override;
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
|
|
@ -42,19 +42,19 @@ class StdClientProcessList : public ClientProcessList
|
|||
protected:
|
||||
|
||||
// ProcessList
|
||||
void onTickObject(ProcessObject *);
|
||||
void advanceObjects();
|
||||
void onAdvanceObjects();
|
||||
void onTickObject(ProcessObject *) override;
|
||||
void advanceObjects() override;
|
||||
void onAdvanceObjects() override;
|
||||
|
||||
public:
|
||||
|
||||
StdClientProcessList();
|
||||
|
||||
// ProcessList
|
||||
bool advanceTime( SimTime timeDelta );
|
||||
bool advanceTime( SimTime timeDelta ) override;
|
||||
|
||||
// ClientProcessList
|
||||
void clientCatchup( GameConnection *conn );
|
||||
void clientCatchup( GameConnection *conn ) override;
|
||||
|
||||
static void init();
|
||||
static void shutdown();
|
||||
|
|
@ -67,9 +67,9 @@ class StdServerProcessList : public ServerProcessList
|
|||
protected:
|
||||
|
||||
// ProcessList
|
||||
void onPreTickObject( ProcessObject *pobj );
|
||||
void onTickObject( ProcessObject *pobj );
|
||||
void advanceObjects();
|
||||
void onPreTickObject( ProcessObject *pobj ) override;
|
||||
void onTickObject( ProcessObject *pobj ) override;
|
||||
void advanceObjects() override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
|
|||
|
|
@ -35,17 +35,17 @@ public:
|
|||
|
||||
StdMoveList();
|
||||
|
||||
void clientWriteMovePacket(BitStream *);
|
||||
void clientReadMovePacket(BitStream *);
|
||||
void clientWriteMovePacket(BitStream *) override;
|
||||
void clientReadMovePacket(BitStream *) override;
|
||||
|
||||
void serverWriteMovePacket(BitStream *);
|
||||
void serverReadMovePacket(BitStream *);
|
||||
void serverWriteMovePacket(BitStream *) override;
|
||||
void serverReadMovePacket(BitStream *) override;
|
||||
|
||||
U32 getMoves(Move**,U32* numMoves);
|
||||
void clearMoves(U32 count);
|
||||
U32 getMoves(Move**,U32* numMoves) override;
|
||||
void clearMoves(U32 count) override;
|
||||
|
||||
void advanceMove();
|
||||
void onAdvanceObjects() {}
|
||||
void advanceMove() override;
|
||||
void onAdvanceObjects() override {}
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue