diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h index fe93de64..631501bb 100644 --- a/src/CBot/CBot.h +++ b/src/CBot/CBot.h @@ -483,8 +483,8 @@ public: ~CBotWhile(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotDo : public CBotInstr @@ -499,8 +499,8 @@ public: ~CBotDo(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotFor : public CBotInstr @@ -517,8 +517,8 @@ public: ~CBotFor(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotBreak : public CBotInstr @@ -531,8 +531,8 @@ public: ~CBotBreak(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotReturn : public CBotInstr @@ -545,8 +545,8 @@ public: ~CBotReturn(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -561,8 +561,8 @@ public: ~CBotSwitch(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -576,9 +576,9 @@ public: ~CBotCase(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); - bool CompCase(CBotStack* &pj, int val); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; + bool CompCase(CBotStack* &pj, int val) override; }; class CBotCatch : public CBotInstr @@ -595,8 +595,8 @@ public: static CBotCatch* Compile(CBotToken* &p, CBotCStack* pStack); bool TestCatch(CBotStack* &pj, int val); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; void RestoreCondState(CBotStack* &pj, bool bMain); }; @@ -612,8 +612,8 @@ public: ~CBotTry(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotThrow : public CBotInstr @@ -626,8 +626,8 @@ public: ~CBotThrow(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -640,7 +640,7 @@ public: ~CBotStartDebugDD(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); + bool Execute(CBotStack* &pj) override; }; @@ -656,8 +656,8 @@ public: ~CBotIf(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -675,8 +675,8 @@ public: ~CBotInt(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip = false); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // definition of an array @@ -695,8 +695,8 @@ public: ~CBotInstArray(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, CBotTypResult type); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -713,15 +713,15 @@ public: ~CBotListArray(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, CBotTypResult type); - bool Execute(CBotStack* &pj, CBotVar* pVar); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj, CBotVar* pVar) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotEmpty : public CBotInstr { - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // defininition of a boolean @@ -737,8 +737,8 @@ public: ~CBotBoolean(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip=false); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -755,8 +755,8 @@ public: ~CBotFloat(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip=false); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // definition of an element string @@ -772,8 +772,8 @@ public: ~CBotIString(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip=false); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // definition of an element of any class @@ -793,8 +793,8 @@ public: ~CBotClassInst(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, CBotClass* pClass = nullptr); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotCondition : public CBotInstr @@ -823,9 +823,9 @@ public: CBotLeftExpr* Compile(CBotToken* &p, CBotCStack* pStack); bool Execute(CBotStack* &pStack, CBotStack* array); - bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile); + bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile) override; bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep); - void RestoreStateVar(CBotStack* &pile, bool bMain); + void RestoreStateVar(CBotStack* &pile, bool bMain) override; }; @@ -843,9 +843,9 @@ public: void SetUniqNum(int num); // static // CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile); - bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep, bool bExtend); - void RestoreStateVar(CBotStack* &pj, bool bMain); + bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile) override; + bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep, bool bExtend) override; + void RestoreStateVar(CBotStack* &pj, bool bMain) override; }; // management of indices of the tables @@ -862,9 +862,9 @@ public: ~CBotIndexExpr(); // static // CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile); - bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep, bool bExtend); - void RestoreStateVar(CBotStack* &pj, bool bMain); + bool ExecuteVar(CBotVar* &pVar, CBotCStack* &pile) override; + bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep, bool bExtend) override; + void RestoreStateVar(CBotStack* &pj, bool bMain) override; }; // expressions like @@ -882,8 +882,8 @@ public: ~CBotExpression(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pStack); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pStack) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotListExpression : public CBotInstr @@ -896,8 +896,8 @@ public: ~CBotListExpression(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pStack); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pStack) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotLogicExpr : public CBotInstr @@ -913,8 +913,8 @@ public: ~CBotLogicExpr(); // static // CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pStack); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pStack) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -952,8 +952,8 @@ public: ~CBotExprUnaire(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pStack); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pStack) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // all operations with two operands @@ -968,8 +968,8 @@ public: ~CBotTwoOpExpr(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, int* pOperations = nullptr); - bool Execute(CBotStack* &pStack); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pStack) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1000,8 +1000,8 @@ public: ~CBotListInstr(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool bLocal = true); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1020,8 +1020,8 @@ public: ~CBotInstrCall(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // a call of method @@ -1045,9 +1045,9 @@ public: ~CBotInstrMethode(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, CBotVar* pVar); - bool Execute(CBotStack* &pj); - bool ExecuteVar(CBotVar* &pVar, CBotStack* &pj, CBotToken* prevToken, bool bStep, bool bExtend); - void RestoreStateVar(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + bool ExecuteVar(CBotVar* &pVar, CBotStack* &pj, CBotToken* prevToken, bool bStep, bool bExtend) override; + void RestoreStateVar(CBotStack* &pj, bool bMain) override; }; // expression for the variable name @@ -1067,11 +1067,11 @@ public: static CBotInstr* CompileMethode(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep); bool Execute2Var(CBotVar* &pVar, CBotStack* &pj, CBotToken* prevToken, bool bStep); - void RestoreStateVar(CBotStack* &pj, bool bMain); + void RestoreStateVar(CBotStack* &pj, bool bMain) override; }; class CBotPostIncExpr : public CBotInstr @@ -1085,8 +1085,8 @@ public: ~CBotPostIncExpr(); // static // CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotPreIncExpr : public CBotInstr @@ -1100,8 +1100,8 @@ public: ~CBotPreIncExpr(); // static // CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1118,8 +1118,8 @@ public: ~CBotLeftExprVar(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1133,8 +1133,8 @@ public: static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1146,8 +1146,8 @@ public: CBotExprNull(); ~CBotExprNull(); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotExprNan : public CBotInstr @@ -1158,8 +1158,8 @@ public: CBotExprNan(); ~CBotExprNan(); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; class CBotNew : public CBotInstr @@ -1176,8 +1176,8 @@ public: static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; // expression representing a number @@ -1194,8 +1194,8 @@ public: ~CBotExprNum(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1211,8 +1211,8 @@ public: ~CBotExprAlpha(); static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack); - bool Execute(CBotStack* &pj); - void RestoreState(CBotStack* &pj, bool bMain); + bool Execute(CBotStack* &pj) override; + void RestoreState(CBotStack* &pj, bool bMain) override; }; @@ -1231,44 +1231,44 @@ public: CBotVarInt( const CBotToken* name ); // ~CBotVarInt(); - void SetValInt(int val, const char* s = nullptr); - void SetValFloat(float val); - int GetValInt(); - float GetValFloat(); - CBotString GetValString(); + void SetValInt(int val, const char* s = nullptr) override; + void SetValFloat(float val) override; + int GetValInt() override; + float GetValFloat() override; + CBotString GetValString() override; - void Copy(CBotVar* pSrc, bool bName=true); + void Copy(CBotVar* pSrc, bool bName=true) override; - void Add(CBotVar* left, CBotVar* right); // addition - void Sub(CBotVar* left, CBotVar* right); // substraction - void Mul(CBotVar* left, CBotVar* right); // multiplication - int Div(CBotVar* left, CBotVar* right); // division - int Modulo(CBotVar* left, CBotVar* right); // remainder of division - void Power(CBotVar* left, CBotVar* right); // power + void Add(CBotVar* left, CBotVar* right) override; // addition + void Sub(CBotVar* left, CBotVar* right) override; // substraction + void Mul(CBotVar* left, CBotVar* right) override; // multiplication + int Div(CBotVar* left, CBotVar* right) override; // division + int Modulo(CBotVar* left, CBotVar* right) override; // remainder of division + void Power(CBotVar* left, CBotVar* right) override; // power - bool Lo(CBotVar* left, CBotVar* right); - bool Hi(CBotVar* left, CBotVar* right); - bool Ls(CBotVar* left, CBotVar* right); - bool Hs(CBotVar* left, CBotVar* right); - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + bool Lo(CBotVar* left, CBotVar* right) override; + bool Hi(CBotVar* left, CBotVar* right) override; + bool Ls(CBotVar* left, CBotVar* right) override; + bool Hs(CBotVar* left, CBotVar* right) override; + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; - void XOr(CBotVar* left, CBotVar* right); - void Or(CBotVar* left, CBotVar* right); - void And(CBotVar* left, CBotVar* right); + void XOr(CBotVar* left, CBotVar* right) override; + void Or(CBotVar* left, CBotVar* right) override; + void And(CBotVar* left, CBotVar* right) override; - void SL(CBotVar* left, CBotVar* right); - void SR(CBotVar* left, CBotVar* right); - void ASR(CBotVar* left, CBotVar* right); + void SL(CBotVar* left, CBotVar* right) override; + void SR(CBotVar* left, CBotVar* right) override; + void ASR(CBotVar* left, CBotVar* right) override; - void Neg(); - void Not(); - void Inc(); - void Dec(); + void Neg() override; + void Not() override; + void Inc() override; + void Dec() override; - bool Save0State(FILE* pf); - bool Save1State(FILE* pf); + bool Save0State(FILE* pf) override; + bool Save1State(FILE* pf) override; }; @@ -1282,34 +1282,34 @@ public: CBotVarFloat( const CBotToken* name ); // ~CBotVarFloat(); - void SetValInt(int val, const char* s = nullptr); - void SetValFloat(float val); - int GetValInt(); - float GetValFloat(); - CBotString GetValString(); + void SetValInt(int val, const char* s = nullptr) override; + void SetValFloat(float val) override; + int GetValInt() override; + float GetValFloat() override; + CBotString GetValString() override; - void Copy(CBotVar* pSrc, bool bName=true); + void Copy(CBotVar* pSrc, bool bName=true) override; - void Add(CBotVar* left, CBotVar* right); // addition - void Sub(CBotVar* left, CBotVar* right); // substraction - void Mul(CBotVar* left, CBotVar* right); // multiplication - int Div(CBotVar* left, CBotVar* right); // division - int Modulo(CBotVar* left, CBotVar* right); // remainder of division - void Power(CBotVar* left, CBotVar* right); // power + void Add(CBotVar* left, CBotVar* right) override; // addition + void Sub(CBotVar* left, CBotVar* right) override; // substraction + void Mul(CBotVar* left, CBotVar* right) override; // multiplication + int Div(CBotVar* left, CBotVar* right) override; // division + int Modulo(CBotVar* left, CBotVar* right) override; // remainder of division + void Power(CBotVar* left, CBotVar* right) override; // power - bool Lo(CBotVar* left, CBotVar* right); - bool Hi(CBotVar* left, CBotVar* right); - bool Ls(CBotVar* left, CBotVar* right); - bool Hs(CBotVar* left, CBotVar* right); - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + bool Lo(CBotVar* left, CBotVar* right) override; + bool Hi(CBotVar* left, CBotVar* right) override; + bool Ls(CBotVar* left, CBotVar* right) override; + bool Hs(CBotVar* left, CBotVar* right) override; + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; - void Neg(); - void Inc(); - void Dec(); + void Neg() override; + void Inc() override; + void Dec() override; - bool Save1State(FILE* pf); + bool Save1State(FILE* pf) override; }; @@ -1323,21 +1323,21 @@ public: CBotVarString( const CBotToken* name ); // ~CBotVarString(); - void SetValString(const char* p); - CBotString GetValString(); + void SetValString(const char* p) override; + CBotString GetValString() override; - void Copy(CBotVar* pSrc, bool bName=true); + void Copy(CBotVar* pSrc, bool bName=true) override; - void Add(CBotVar* left, CBotVar* right); // addition + void Add(CBotVar* left, CBotVar* right) override; // addition - bool Lo(CBotVar* left, CBotVar* right); - bool Hi(CBotVar* left, CBotVar* right); - bool Ls(CBotVar* left, CBotVar* right); - bool Hs(CBotVar* left, CBotVar* right); - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + bool Lo(CBotVar* left, CBotVar* right) override; + bool Hi(CBotVar* left, CBotVar* right) override; + bool Ls(CBotVar* left, CBotVar* right) override; + bool Hs(CBotVar* left, CBotVar* right) override; + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; - bool Save1State(FILE* pf); + bool Save1State(FILE* pf) override; }; // class for the management of boolean @@ -1350,22 +1350,22 @@ public: CBotVarBoolean( const CBotToken* name ); // ~CBotVarBoolean(); - void SetValInt(int val, const char* s = nullptr); - void SetValFloat(float val); - int GetValInt(); - float GetValFloat(); - CBotString GetValString(); + void SetValInt(int val, const char* s = nullptr) override; + void SetValFloat(float val) override; + int GetValInt() override; + float GetValFloat() override; + CBotString GetValString() override; - void Copy(CBotVar* pSrc, bool bName=true); + void Copy(CBotVar* pSrc, bool bName=true) override; - void And(CBotVar* left, CBotVar* right); - void Or(CBotVar* left, CBotVar* right); - void XOr(CBotVar* left, CBotVar* right); - void Not(); - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + void And(CBotVar* left, CBotVar* right) override; + void Or(CBotVar* left, CBotVar* right) override; + void XOr(CBotVar* left, CBotVar* right) override; + void Not() override; + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; - bool Save1State(FILE* pf); + bool Save1State(FILE* pf) override; }; @@ -1394,38 +1394,38 @@ public: ~CBotVarClass(); // void InitCBotVarClass( const CBotToken* name, CBotTypResult& type, int &nIdent ); - void Copy(CBotVar* pSrc, bool bName=true); - void SetClass(CBotClass* pClass); //, int &nIdent); - CBotClass* GetClass(); - CBotVar* GetItem(const char* name); // return an element of a class according to its name (*) - CBotVar* GetItemRef(int nIdent); + void Copy(CBotVar* pSrc, bool bName=true) override; + void SetClass(CBotClass* pClass) override; //, int &nIdent); + CBotClass* GetClass() override; + CBotVar* GetItem(const char* name) override; // return an element of a class according to its name (*) + CBotVar* GetItemRef(int nIdent) override; - CBotVar* GetItem(int n, bool bExtend); - CBotVar* GetItemList(); + CBotVar* GetItem(int n, bool bExtend) override; + CBotVar* GetItemList() override; - CBotString GetValString(); + CBotString GetValString() override; - bool Save1State(FILE* pf); - void Maj(void* pUser, bool bContinue); + bool Save1State(FILE* pf) override; + void Maj(void* pUser, bool bContinue) override; void IncrementUse(); // a reference to incrementation void DecrementUse(); // a reference to decrementation CBotVarClass* - GetPointer(); + GetPointer() override; void SetItemList(CBotVar* pVar); - void SetIdent(long n); + void SetIdent(long n) override; static CBotVarClass* Find(long id); // CBotVar* GetMyThis(); - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; - void ConstructorSet(); + void ConstructorSet() override; }; @@ -1442,27 +1442,27 @@ public: CBotVarPointer( const CBotToken* name, CBotTypResult& type ); ~CBotVarPointer(); - void Copy(CBotVar* pSrc, bool bName=true); - void SetClass(CBotClass* pClass); - CBotClass* GetClass(); - CBotVar* GetItem(const char* name); // return an element of a class according to its name (*) - CBotVar* GetItemRef(int nIdent); - CBotVar* GetItemList(); + void Copy(CBotVar* pSrc, bool bName=true) override; + void SetClass(CBotClass* pClass) override; + CBotClass* GetClass() override; + CBotVar* GetItem(const char* name) override; // return an element of a class according to its name (*) + CBotVar* GetItemRef(int nIdent) override; + CBotVar* GetItemList() override; - CBotString GetValString(); - void SetPointer(CBotVar* p); + CBotString GetValString() override; + void SetPointer(CBotVar* p) override; CBotVarClass* - GetPointer(); + GetPointer() override; - void SetIdent(long n); // associates an identification number (unique) + void SetIdent(long n) override; // associates an identification number (unique) long GetIdent(); // gives the identification number associated with - void ConstructorSet(); + void ConstructorSet() override; - bool Save1State(FILE* pf); - void Maj(void* pUser, bool bContinue); + bool Save1State(FILE* pf) override; + void Maj(void* pUser, bool bContinue) override; - bool Eq(CBotVar* left, CBotVar* right); - bool Ne(CBotVar* left, CBotVar* right); + bool Eq(CBotVar* left, CBotVar* right) override; + bool Ne(CBotVar* left, CBotVar* right) override; }; @@ -1482,19 +1482,19 @@ public: CBotVarArray( const CBotToken* name, CBotTypResult& type ); ~CBotVarArray(); - void SetPointer(CBotVar* p); + void SetPointer(CBotVar* p) override; CBotVarClass* - GetPointer(); + GetPointer() override; - void Copy(CBotVar* pSrc, bool bName=true); - CBotVar* GetItem(int n, bool bGrow=false); // makes an element according to its numeric index + void Copy(CBotVar* pSrc, bool bName=true) override; + CBotVar* GetItem(int n, bool bGrow=false) override; // makes an element according to its numeric index // enlarged the table if necessary if bExtend // CBotVar* GetItem(const char* name); // makes a element by literal index - CBotVar* GetItemList(); // gives the first item in the list + CBotVar* GetItemList() override; // gives the first item in the list - CBotString GetValString(); // gets the contents of the array into a string + CBotString GetValString() override; // gets the contents of the array into a string - bool Save1State(FILE* pf); + bool Save1State(FILE* pf) override; }; diff --git a/src/app/system_linux.h b/src/app/system_linux.h index f90d2017..d308548b 100644 --- a/src/app/system_linux.h +++ b/src/app/system_linux.h @@ -35,16 +35,16 @@ struct SystemTimeStamp class CSystemUtilsLinux : public CSystemUtils { public: - virtual void Init() override; + void Init() override; - virtual SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; + SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; - virtual void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; - virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; + void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; + long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; - virtual std::string GetSaveDir() override; + std::string GetSaveDir() override; - virtual void Usleep(int usec) override; + void Usleep(int usec) override; private: bool m_zenityAvailable = false; diff --git a/src/app/system_macosx.h b/src/app/system_macosx.h index 424a0929..386af92d 100644 --- a/src/app/system_macosx.h +++ b/src/app/system_macosx.h @@ -28,13 +28,13 @@ class CSystemUtilsMacOSX : public CSystemUtilsOther { public: - virtual void Init() override; + void Init() override; - virtual std::string GetDataPath() override; - virtual std::string GetLangPath() override; - virtual std::string GetSaveDir() override; + std::string GetDataPath() override; + std::string GetLangPath() override; + std::string GetSaveDir() override; - virtual void Usleep(int usec) override; + void Usleep(int usec) override; private: std::string m_ASPath; diff --git a/src/app/system_other.h b/src/app/system_other.h index 8528c273..ec5af418 100644 --- a/src/app/system_other.h +++ b/src/app/system_other.h @@ -42,12 +42,12 @@ struct SystemTimeStamp class CSystemUtilsOther : public CSystemUtils { public: - virtual void Init() override; - virtual SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; + void Init() override; + SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; - virtual void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; - virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; + void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; + long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; - virtual void Usleep(int usec) override; + void Usleep(int usec) override; }; diff --git a/src/app/system_windows.h b/src/app/system_windows.h index 991d73ab..47cd9c74 100644 --- a/src/app/system_windows.h +++ b/src/app/system_windows.h @@ -33,16 +33,16 @@ struct SystemTimeStamp class CSystemUtilsWindows : public CSystemUtils { public: - virtual void Init() override; + void Init() override; - virtual SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; + SystemDialogResult SystemDialog(SystemDialogType type, const std::string& title, const std::string& message) override; - virtual void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; - virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; + void GetCurrentTimeStamp(SystemTimeStamp *stamp) override; + long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; - virtual std::string GetSaveDir() override; + std::string GetSaveDir() override; - virtual void Usleep(int usec) override; + void Usleep(int usec) override; public: static std::string UTF8_Encode(const std::wstring &wstr); diff --git a/src/graphics/core/framebuffer.h b/src/graphics/core/framebuffer.h index d3e550ae..2e802795 100644 --- a/src/graphics/core/framebuffer.h +++ b/src/graphics/core/framebuffer.h @@ -122,40 +122,40 @@ public: explicit CDefaultFramebuffer(const FramebufferParams ¶ms); //! Creates default framebuffer - virtual void Create() override; + void Create() override; //! Destroys default framebuffer - virtual void Destroy() override; + void Destroy() override; //! Returns true - virtual bool IsDefault() override; + bool IsDefault() override; //! Returns width of buffers in this framebuffer - virtual int GetWidth() override; + int GetWidth() override; //! Returns height of buffers in this framebuffer - virtual int GetHeight() override; + int GetHeight() override; //! Returns depth size in bits - virtual int GetDepth() override; + int GetDepth() override; //! Returns number of samples or 1 if multisampling is not supported - virtual int GetSamples() override; + int GetSamples() override; //! Returns texture that contains color buffer or 0 if not available - virtual int GetColorTexture() override; + int GetColorTexture() override; //! Returns texture that contains depth buffer or 0 if not available - virtual int GetDepthTexture() override; + int GetDepthTexture() override; //! Binds this framebuffer to context - virtual void Bind() override; + void Bind() override; //! Unbinds this framebuffer from context - virtual void Unbind() override; + void Unbind() override; //! Copies content of color buffer to screen - virtual void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; + void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; }; } // end of Gfx diff --git a/src/graphics/core/nulldevice.cpp b/src/graphics/core/nulldevice.cpp index 7710487e..0e8af33a 100644 --- a/src/graphics/core/nulldevice.cpp +++ b/src/graphics/core/nulldevice.cpp @@ -73,24 +73,10 @@ void CNullDevice::SetTransform(TransformType type, const Math::Matrix &matrix) { } -const Math::Matrix& CNullDevice::GetTransform(TransformType type) -{ - return m_matrix; -} - -void CNullDevice::MultiplyTransform(TransformType type, const Math::Matrix &matrix) -{ -} - void CNullDevice::SetMaterial(const Material &material) { } -const Material& CNullDevice::GetMaterial() -{ - return m_material; -} - int CNullDevice::GetMaxLightCount() { return 99; @@ -100,20 +86,10 @@ void CNullDevice::SetLight(int index, const Light &light) { } -const Light& CNullDevice::GetLight(int index) -{ - return m_light; -} - void CNullDevice::SetLightEnabled(int index, bool enabled) { } -bool CNullDevice::GetLightEnabled(int index) -{ - return false; -} - Texture CNullDevice::CreateTexture(CImage *image, const TextureCreateParams ¶ms) { Texture tex; @@ -156,20 +132,10 @@ void CNullDevice::SetTexture(int index, unsigned int textureId) { } -Texture CNullDevice::GetTexture(int index) -{ - return Texture(); -} - void CNullDevice::SetTextureEnabled(int index, bool enabled) { } -bool CNullDevice::GetTextureEnabled(int index) -{ - return false; -} - void CNullDevice::SetTextureStageParams(int index, const TextureStageParams ¶ms) { } @@ -182,11 +148,6 @@ void CNullDevice::SetTextureCoordGeneration(int index, TextureGenerationParams & { } -TextureStageParams CNullDevice::GetTextureStageParams(int index) -{ - return TextureStageParams(); -} - void CNullDevice::DrawPrimitive(PrimitiveType type, const Vertex *vertices, int vertexCount, Color color) { @@ -249,11 +210,6 @@ void CNullDevice::SetRenderState(RenderState state, bool enabled) { } -bool CNullDevice::GetRenderState(RenderState state) -{ - return false; -} - void CNullDevice::SetColorMask(bool red, bool green, bool blue, bool alpha) { } @@ -262,86 +218,38 @@ void CNullDevice::SetDepthTestFunc(CompFunc func) { } -CompFunc CNullDevice::GetDepthTestFunc() -{ - return COMP_FUNC_NEVER; -} - void CNullDevice::SetDepthBias(float factor, float units) { } -float CNullDevice::GetDepthBias() -{ - return 0.0f; -} - void CNullDevice::SetAlphaTestFunc(CompFunc func, float refValue) { } -void CNullDevice::GetAlphaTestFunc(CompFunc &func, float &refValue) -{ - - func = COMP_FUNC_NEVER; - refValue = 0.0f; -} - void CNullDevice::SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) { } -void CNullDevice::GetBlendFunc(BlendFunc &srcBlend, BlendFunc &dstBlend) -{ - srcBlend = BLEND_ZERO; - dstBlend = BLEND_ZERO; -} - void CNullDevice::SetClearColor(const Color &color) { } -Color CNullDevice::GetClearColor() -{ - return Color(0.0f, 0.0f, 0.0f, 0.0f); -} - void CNullDevice::SetGlobalAmbient(const Color &color) { } -Color CNullDevice::GetGlobalAmbient() -{ - return Color(0.0f, 0.0f, 0.0f, 0.0f); -} - void CNullDevice::SetFogParams(FogMode mode, const Color &color, float start, float end, float density) { } -void CNullDevice::GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density) -{ - // -} - void CNullDevice::SetCullMode(CullMode mode) { } -CullMode CNullDevice::GetCullMode() -{ - return CULL_CW; -} - void CNullDevice::SetShadeModel(ShadeModel model) { } -ShadeModel CNullDevice::GetShadeModel() -{ - return SHADE_FLAT; -} - void CNullDevice::SetShadowColor(float value) { } @@ -350,11 +258,6 @@ void CNullDevice::SetFillMode(FillMode mode) { } -FillMode CNullDevice::GetFillMode() -{ - return FILL_POINT; -} - void CNullDevice::CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) { } diff --git a/src/graphics/core/nulldevice.h b/src/graphics/core/nulldevice.h index 921ebaca..7a48687d 100644 --- a/src/graphics/core/nulldevice.h +++ b/src/graphics/core/nulldevice.h @@ -42,127 +42,106 @@ public: CNullDevice(); virtual ~CNullDevice(); - virtual void DebugHook(); - virtual void DebugLights(); + void DebugHook() override; + void DebugLights() override; - virtual bool Create(); - virtual void Destroy(); + bool Create() override; + void Destroy() override; - virtual void ConfigChanged(const DeviceConfig &newConfig); + void ConfigChanged(const DeviceConfig &newConfig) override; - virtual void BeginScene(); - virtual void EndScene(); + void BeginScene() override; + void EndScene() override; - virtual void Clear(); + void Clear() override; - virtual void SetTransform(TransformType type, const Math::Matrix &matrix); - virtual const Math::Matrix& GetTransform(TransformType type); - virtual void MultiplyTransform(TransformType type, const Math::Matrix &matrix); + void SetTransform(TransformType type, const Math::Matrix &matrix) override; - virtual void SetMaterial(const Material &material); - virtual const Material& GetMaterial(); + void SetMaterial(const Material &material) override; - virtual int GetMaxLightCount(); - virtual void SetLight(int index, const Light &light); - virtual const Light& GetLight(int index); - virtual void SetLightEnabled(int index, bool enabled); - virtual bool GetLightEnabled(int index); + int GetMaxLightCount() override; + void SetLight(int index, const Light &light) override; + void SetLightEnabled(int index, bool enabled) override; - virtual Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms); - virtual Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms); - virtual Texture CreateDepthTexture(int width, int height, int depth); - virtual void DestroyTexture(const Texture &texture); - virtual void DestroyAllTextures(); + Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; + Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; + Texture CreateDepthTexture(int width, int height, int depth) override; + void DestroyTexture(const Texture &texture) override; + void DestroyAllTextures() override; - virtual int GetMaxTextureStageCount(); - virtual void SetTexture(int index, const Texture &texture); - virtual void SetTexture(int index, unsigned int textureId); - virtual Texture GetTexture(int index); - virtual void SetTextureEnabled(int index, bool enabled); - virtual bool GetTextureEnabled(int index); + int GetMaxTextureStageCount() override; + void SetTexture(int index, const Texture &texture) override; + void SetTexture(int index, unsigned int textureId) override; + void SetTextureEnabled(int index, bool enabled) override; - virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms); - virtual TextureStageParams GetTextureStageParams(int index); + void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; - virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT); - virtual void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms); + void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; + void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; - virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount, - Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)); - virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount, - Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)); - virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount); + void DrawPrimitive(PrimitiveType type, const Vertex* vertices, int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; + void DrawPrimitive(PrimitiveType type, const VertexTex2* vertices, int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; + void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount); - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount); - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount); - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount); - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount); - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount); - virtual void DrawStaticBuffer(unsigned int bufferId); - virtual void DestroyStaticBuffer(unsigned int bufferId); + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void DrawStaticBuffer(unsigned int bufferId) override; + void DestroyStaticBuffer(unsigned int bufferId) override; - virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius); + int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; - virtual void SetViewport(int x, int y, int width, int height); + void SetViewport(int x, int y, int width, int height) override; - virtual void SetRenderState(RenderState state, bool enabled); - virtual bool GetRenderState(RenderState state); + void SetRenderState(RenderState state, bool enabled) override; - virtual void SetColorMask(bool red, bool green, bool blue, bool alpha); + void SetColorMask(bool red, bool green, bool blue, bool alpha) override; - virtual void SetDepthTestFunc(CompFunc func); - virtual CompFunc GetDepthTestFunc(); + void SetDepthTestFunc(CompFunc func) override; - virtual void SetDepthBias(float factor, float units); - virtual float GetDepthBias(); + void SetDepthBias(float factor, float units) override; - virtual void SetAlphaTestFunc(CompFunc func, float refValue); - virtual void GetAlphaTestFunc(CompFunc &func, float &refValue); + void SetAlphaTestFunc(CompFunc func, float refValue) override; - virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend); - virtual void GetBlendFunc(BlendFunc &srcBlend, BlendFunc &dstBlend); + void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; - virtual void SetClearColor(const Color &color); - virtual Color GetClearColor(); + void SetClearColor(const Color &color) override; - virtual void SetGlobalAmbient(const Color &color); - virtual Color GetGlobalAmbient(); + void SetGlobalAmbient(const Color &color) override; - virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density); - virtual void GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density); + void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; - virtual void SetCullMode(CullMode mode); - virtual CullMode GetCullMode(); + void SetCullMode(CullMode mode) override; - virtual void SetShadeModel(ShadeModel model); - virtual ShadeModel GetShadeModel(); + void SetShadeModel(ShadeModel model) override; - virtual void SetShadowColor(float value); + void SetShadowColor(float value) override; - virtual void SetFillMode(FillMode mode) ; - virtual FillMode GetFillMode(); + void SetFillMode(FillMode mode) override; - virtual void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height); + void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; - virtual std::unique_ptr GetFrameBufferPixels() const; + std::unique_ptr GetFrameBufferPixels() const override; - virtual CFramebuffer* GetFramebuffer(std::string name); + CFramebuffer* GetFramebuffer(std::string name) override; - virtual CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params); + CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; - virtual void DeleteFramebuffer(std::string name); + void DeleteFramebuffer(std::string name) override; - virtual bool IsAnisotropySupported(); - virtual int GetMaxAnisotropyLevel(); + bool IsAnisotropySupported() override; + int GetMaxAnisotropyLevel() override; - virtual int GetMaxSamples(); + int GetMaxSamples() override; - virtual bool IsShadowMappingSupported(); + bool IsShadowMappingSupported() override; - virtual int GetMaxTextureSize(); + int GetMaxTextureSize() override; - virtual bool IsFramebufferSupported(); + bool IsFramebufferSupported() override; private: Math::Matrix m_matrix; diff --git a/src/graphics/opengl/gl21device.h b/src/graphics/opengl/gl21device.h index 6e826d0f..bbb32e01 100644 --- a/src/graphics/opengl/gl21device.h +++ b/src/graphics/opengl/gl21device.h @@ -57,108 +57,108 @@ public: CGL21Device(const DeviceConfig &config); virtual ~CGL21Device(); - virtual void DebugHook() override; - virtual void DebugLights() override; + void DebugHook() override; + void DebugLights() override; - virtual bool Create() override; - virtual void Destroy() override; + bool Create() override; + void Destroy() override; - virtual void ConfigChanged(const DeviceConfig &newConfig) override; + void ConfigChanged(const DeviceConfig &newConfig) override; - virtual void BeginScene() override; - virtual void EndScene() override; + void BeginScene() override; + void EndScene() override; - virtual void Clear() override; + void Clear() override; - virtual void SetTransform(TransformType type, const Math::Matrix &matrix) override; + void SetTransform(TransformType type, const Math::Matrix &matrix) override; - virtual void SetMaterial(const Material &material) override; + void SetMaterial(const Material &material) override; - virtual int GetMaxLightCount() override; - virtual void SetLight(int index, const Light &light) override; - virtual void SetLightEnabled(int index, bool enabled) override; + int GetMaxLightCount() override; + void SetLight(int index, const Light &light) override; + void SetLightEnabled(int index, bool enabled) override; - virtual Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; - virtual Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; - virtual Texture CreateDepthTexture(int width, int height, int depth) override; - virtual void DestroyTexture(const Texture &texture) override; - virtual void DestroyAllTextures() override; + Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; + Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; + Texture CreateDepthTexture(int width, int height, int depth) override; + void DestroyTexture(const Texture &texture) override; + void DestroyAllTextures() override; - virtual int GetMaxTextureStageCount() override; - virtual void SetTexture(int index, const Texture &texture) override; - virtual void SetTexture(int index, unsigned int textureId) override; - virtual void SetTextureEnabled(int index, bool enabled) override; + int GetMaxTextureStageCount() override; + void SetTexture(int index, const Texture &texture) override; + void SetTexture(int index, unsigned int textureId) override; + void SetTextureEnabled(int index, bool enabled) override; - virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; + void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; - virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; - virtual void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; + void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; + void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; - virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; + void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void DrawStaticBuffer(unsigned int bufferId) override; - virtual void DestroyStaticBuffer(unsigned int bufferId) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void DrawStaticBuffer(unsigned int bufferId) override; + void DestroyStaticBuffer(unsigned int bufferId) override; - virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; + int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; - virtual void SetViewport(int x, int y, int width, int height) override; + void SetViewport(int x, int y, int width, int height) override; - virtual void SetRenderState(RenderState state, bool enabled) override; + void SetRenderState(RenderState state, bool enabled) override; - virtual void SetColorMask(bool red, bool green, bool blue, bool alpha) override; + void SetColorMask(bool red, bool green, bool blue, bool alpha) override; - virtual void SetDepthTestFunc(CompFunc func) override; + void SetDepthTestFunc(CompFunc func) override; - virtual void SetDepthBias(float factor, float units) override; + void SetDepthBias(float factor, float units) override; - virtual void SetAlphaTestFunc(CompFunc func, float refValue) override; + void SetAlphaTestFunc(CompFunc func, float refValue) override; - virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; + void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; - virtual void SetClearColor(const Color &color) override; + void SetClearColor(const Color &color) override; - virtual void SetGlobalAmbient(const Color &color) override; + void SetGlobalAmbient(const Color &color) override; - virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; + void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; - virtual void SetCullMode(CullMode mode) override; + void SetCullMode(CullMode mode) override; - virtual void SetShadeModel(ShadeModel model) override; + void SetShadeModel(ShadeModel model) override; - virtual void SetShadowColor(float value) override; + void SetShadowColor(float value) override; - virtual void SetFillMode(FillMode mode) override; + void SetFillMode(FillMode mode) override; - virtual void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; + void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; - virtual std::unique_ptr GetFrameBufferPixels() const override; + std::unique_ptr GetFrameBufferPixels() const override; - virtual CFramebuffer* GetFramebuffer(std::string name) override; + CFramebuffer* GetFramebuffer(std::string name) override; - virtual CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; + CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; - virtual void DeleteFramebuffer(std::string name) override; + void DeleteFramebuffer(std::string name) override; - virtual bool IsAnisotropySupported() override; - virtual int GetMaxAnisotropyLevel() override; + bool IsAnisotropySupported() override; + int GetMaxAnisotropyLevel() override; - virtual int GetMaxSamples() override; + int GetMaxSamples() override; - virtual bool IsShadowMappingSupported() override; + bool IsShadowMappingSupported() override; - virtual int GetMaxTextureSize() override; + int GetMaxTextureSize() override; - virtual bool IsFramebufferSupported() override; + bool IsFramebufferSupported() override; private: //! Updates position for given light based on transformation matrices diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h index 1c5952d9..1845aeb4 100644 --- a/src/graphics/opengl/gl33device.h +++ b/src/graphics/opengl/gl33device.h @@ -57,108 +57,108 @@ public: CGL33Device(const DeviceConfig &config); virtual ~CGL33Device(); - virtual void DebugHook() override; - virtual void DebugLights() override; + void DebugHook() override; + void DebugLights() override; - virtual bool Create() override; - virtual void Destroy() override; + bool Create() override; + void Destroy() override; - virtual void ConfigChanged(const DeviceConfig &newConfig) override; + void ConfigChanged(const DeviceConfig &newConfig) override; - virtual void BeginScene() override; - virtual void EndScene() override; + void BeginScene() override; + void EndScene() override; - virtual void Clear() override; + void Clear() override; - virtual void SetTransform(TransformType type, const Math::Matrix &matrix) override; + void SetTransform(TransformType type, const Math::Matrix &matrix) override; - virtual void SetMaterial(const Material &material) override; + void SetMaterial(const Material &material) override; - virtual int GetMaxLightCount() override; - virtual void SetLight(int index, const Light &light) override; - virtual void SetLightEnabled(int index, bool enabled) override; + int GetMaxLightCount() override; + void SetLight(int index, const Light &light) override; + void SetLightEnabled(int index, bool enabled) override; - virtual Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; - virtual Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; - virtual Texture CreateDepthTexture(int width, int height, int depth) override; - virtual void DestroyTexture(const Texture &texture) override; - virtual void DestroyAllTextures() override; + Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; + Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; + Texture CreateDepthTexture(int width, int height, int depth) override; + void DestroyTexture(const Texture &texture) override; + void DestroyAllTextures() override; - virtual int GetMaxTextureStageCount() override; - virtual void SetTexture(int index, const Texture &texture) override; - virtual void SetTexture(int index, unsigned int textureId) override; - virtual void SetTextureEnabled(int index, bool enabled) override; + int GetMaxTextureStageCount() override; + void SetTexture(int index, const Texture &texture) override; + void SetTexture(int index, unsigned int textureId) override; + void SetTextureEnabled(int index, bool enabled) override; - virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; + void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; - virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; - virtual void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; + void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; + void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; - virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; + void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void DrawStaticBuffer(unsigned int bufferId) override; - virtual void DestroyStaticBuffer(unsigned int bufferId) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void DrawStaticBuffer(unsigned int bufferId) override; + void DestroyStaticBuffer(unsigned int bufferId) override; - virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; + int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; - virtual void SetViewport(int x, int y, int width, int height) override; + void SetViewport(int x, int y, int width, int height) override; - virtual void SetRenderState(RenderState state, bool enabled) override; + void SetRenderState(RenderState state, bool enabled) override; - virtual void SetColorMask(bool red, bool green, bool blue, bool alpha) override; + void SetColorMask(bool red, bool green, bool blue, bool alpha) override; - virtual void SetDepthTestFunc(CompFunc func) override; + void SetDepthTestFunc(CompFunc func) override; - virtual void SetDepthBias(float factor, float units) override; + void SetDepthBias(float factor, float units) override; - virtual void SetAlphaTestFunc(CompFunc func, float refValue) override; + void SetAlphaTestFunc(CompFunc func, float refValue) override; - virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; + void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; - virtual void SetClearColor(const Color &color) override; + void SetClearColor(const Color &color) override; - virtual void SetGlobalAmbient(const Color &color) override; + void SetGlobalAmbient(const Color &color) override; - virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; + void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; - virtual void SetCullMode(CullMode mode) override; + void SetCullMode(CullMode mode) override; - virtual void SetShadeModel(ShadeModel model) override; + void SetShadeModel(ShadeModel model) override; - virtual void SetShadowColor(float value) override; + void SetShadowColor(float value) override; - virtual void SetFillMode(FillMode mode) override; + void SetFillMode(FillMode mode) override; - virtual void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; + void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; - virtual std::unique_ptr GetFrameBufferPixels() const override; + std::unique_ptr GetFrameBufferPixels() const override; - virtual CFramebuffer* GetFramebuffer(std::string name) override; + CFramebuffer* GetFramebuffer(std::string name) override; - virtual CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; + CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; - virtual void DeleteFramebuffer(std::string name) override; + void DeleteFramebuffer(std::string name) override; - virtual bool IsAnisotropySupported() override; - virtual int GetMaxAnisotropyLevel() override; + bool IsAnisotropySupported() override; + int GetMaxAnisotropyLevel() override; - virtual int GetMaxSamples() override; + int GetMaxSamples() override; - virtual bool IsShadowMappingSupported() override; + bool IsShadowMappingSupported() override; - virtual int GetMaxTextureSize() override; + int GetMaxTextureSize() override; - virtual bool IsFramebufferSupported() override; + bool IsFramebufferSupported() override; private: //! Updates position for given light based on transformation matrices diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index 57b7b0c5..5a3e1048 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -76,108 +76,108 @@ public: CGLDevice(const DeviceConfig &config); virtual ~CGLDevice(); - virtual void DebugHook() override; - virtual void DebugLights() override; + void DebugHook() override; + void DebugLights() override; - virtual bool Create() override; - virtual void Destroy() override; + bool Create() override; + void Destroy() override; - virtual void ConfigChanged(const DeviceConfig &newConfig) override; + void ConfigChanged(const DeviceConfig &newConfig) override; - virtual void BeginScene() override; - virtual void EndScene() override; + void BeginScene() override; + void EndScene() override; - virtual void Clear() override; + void Clear() override; - virtual void SetTransform(TransformType type, const Math::Matrix &matrix) override; + void SetTransform(TransformType type, const Math::Matrix &matrix) override; - virtual void SetMaterial(const Material &material) override; + void SetMaterial(const Material &material) override; - virtual int GetMaxLightCount() override; - virtual void SetLight(int index, const Light &light) override; - virtual void SetLightEnabled(int index, bool enabled) override; + int GetMaxLightCount() override; + void SetLight(int index, const Light &light) override; + void SetLightEnabled(int index, bool enabled) override; - virtual Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; - virtual Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; - virtual Texture CreateDepthTexture(int width, int height, int depth) override; - virtual void DestroyTexture(const Texture &texture) override; - virtual void DestroyAllTextures() override; + Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms) override; + Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms) override; + Texture CreateDepthTexture(int width, int height, int depth) override; + void DestroyTexture(const Texture &texture) override; + void DestroyAllTextures() override; - virtual int GetMaxTextureStageCount() override; - virtual void SetTexture(int index, const Texture &texture) override; - virtual void SetTexture(int index, unsigned int textureId) override; - virtual void SetTextureEnabled(int index, bool enabled) override; + int GetMaxTextureStageCount() override; + void SetTexture(int index, const Texture &texture) override; + void SetTexture(int index, unsigned int textureId) override; + void SetTextureEnabled(int index, bool enabled) override; - virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; + void SetTextureStageParams(int index, const TextureStageParams ¶ms) override; - virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; - virtual void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; + void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT) override; + void SetTextureCoordGeneration(int index, TextureGenerationParams ¶ms) override; virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount, Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)) override; - virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; + void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; - virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; - virtual void DrawStaticBuffer(unsigned int bufferId) override; - virtual void DestroyStaticBuffer(unsigned int bufferId) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount) override; + void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount) override; + void DrawStaticBuffer(unsigned int bufferId) override; + void DestroyStaticBuffer(unsigned int bufferId) override; - virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; + int ComputeSphereVisibility(const Math::Vector ¢er, float radius) override; - virtual void SetViewport(int x, int y, int width, int height) override; + void SetViewport(int x, int y, int width, int height) override; - virtual void SetRenderState(RenderState state, bool enabled) override; + void SetRenderState(RenderState state, bool enabled) override; - virtual void SetColorMask(bool red, bool green, bool blue, bool alpha) override; + void SetColorMask(bool red, bool green, bool blue, bool alpha) override; - virtual void SetDepthTestFunc(CompFunc func) override; + void SetDepthTestFunc(CompFunc func) override; - virtual void SetDepthBias(float factor, float units) override; + void SetDepthBias(float factor, float units) override; - virtual void SetAlphaTestFunc(CompFunc func, float refValue) override; + void SetAlphaTestFunc(CompFunc func, float refValue) override; - virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; + void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) override; - virtual void SetClearColor(const Color &color) override; + void SetClearColor(const Color &color) override; - virtual void SetGlobalAmbient(const Color &color) override; + void SetGlobalAmbient(const Color &color) override; - virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; + void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) override; - virtual void SetCullMode(CullMode mode) override; + void SetCullMode(CullMode mode) override; - virtual void SetShadeModel(ShadeModel model) override; + void SetShadeModel(ShadeModel model) override; - virtual void SetShadowColor(float value) override; + void SetShadowColor(float value) override; - virtual void SetFillMode(FillMode mode) override; + void SetFillMode(FillMode mode) override; - virtual void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; + void CopyFramebufferToTexture(Texture& texture, int xOffset, int yOffset, int x, int y, int width, int height) override; - virtual std::unique_ptr GetFrameBufferPixels() const override; + std::unique_ptr GetFrameBufferPixels() const override; - virtual CFramebuffer* GetFramebuffer(std::string name) override; + CFramebuffer* GetFramebuffer(std::string name) override; - virtual CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; + CFramebuffer* CreateFramebuffer(std::string name, const FramebufferParams& params) override; - virtual void DeleteFramebuffer(std::string name) override; + void DeleteFramebuffer(std::string name) override; - virtual bool IsAnisotropySupported() override; - virtual int GetMaxAnisotropyLevel() override; + bool IsAnisotropySupported() override; + int GetMaxAnisotropyLevel() override; - virtual int GetMaxSamples() override; + int GetMaxSamples() override; - virtual bool IsShadowMappingSupported() override; + bool IsShadowMappingSupported() override; - virtual int GetMaxTextureSize() override; + int GetMaxTextureSize() override; - virtual bool IsFramebufferSupported() override; + bool IsFramebufferSupported() override; private: //! Updates internal modelview matrix diff --git a/src/graphics/opengl/glframebuffer.h b/src/graphics/opengl/glframebuffer.h index 694a973b..a6b98613 100644 --- a/src/graphics/opengl/glframebuffer.h +++ b/src/graphics/opengl/glframebuffer.h @@ -51,29 +51,29 @@ protected: public: CGLFramebuffer(const FramebufferParams& params); - virtual void Create() override; + void Create() override; - virtual void Destroy() override; + void Destroy() override; - virtual bool IsDefault() override; + bool IsDefault() override; - virtual int GetWidth() override; + int GetWidth() override; - virtual int GetHeight() override; + int GetHeight() override; - virtual int GetDepth() override; + int GetDepth() override; - virtual int GetSamples() override; + int GetSamples() override; - virtual int GetColorTexture() override; + int GetColorTexture() override; - virtual int GetDepthTexture() override; + int GetDepthTexture() override; - virtual void Bind() override; + void Bind() override; - virtual void Unbind() override; + void Unbind() override; - virtual void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; + void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; }; /** @@ -101,29 +101,29 @@ protected: public: CGLFramebufferEXT(const FramebufferParams& params); - virtual void Create() override; + void Create() override; - virtual void Destroy() override; + void Destroy() override; - virtual bool IsDefault() override; + bool IsDefault() override; - virtual int GetWidth() override; + int GetWidth() override; - virtual int GetHeight() override; + int GetHeight() override; - virtual int GetDepth() override; + int GetDepth() override; - virtual int GetSamples() override; + int GetSamples() override; - virtual int GetColorTexture() override; + int GetColorTexture() override; - virtual int GetDepthTexture() override; + int GetDepthTexture() override; - virtual void Bind() override; + void Bind() override; - virtual void Unbind() override; + void Unbind() override; - virtual void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; + void CopyToScreen(int fromX, int fromY, int fromWidth, int fromHeight, int toX, int toY, int toWidth, int toHeight) override; }; } // end of Gfx diff --git a/src/level/scene_conditions.h b/src/level/scene_conditions.h index b0735360..9ea6f30a 100644 --- a/src/level/scene_conditions.h +++ b/src/level/scene_conditions.h @@ -80,7 +80,7 @@ public: bool immediat = false; //! Read from line in scene file - virtual void Read(CLevelParserLine* line); + void Read(CLevelParserLine* line) override; //! Checks if lost condition is met bool CheckLost(); @@ -102,5 +102,5 @@ public: bool changed = false; //! Read from line in scene file - virtual void Read(CLevelParserLine* line); + void Read(CLevelParserLine* line) override; }; diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h index 57731bfc..7a2e40ae 100644 --- a/src/object/auto/autobase.h +++ b/src/object/auto/autobase.h @@ -72,15 +72,15 @@ public: CAutoBase(COldObject* object); ~CAutoBase(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - void Start(int param); - bool EventProcess(const Event &event); - bool Abort(); - Error GetError(); + void Init() override; + void Start(int param) override; + bool EventProcess(const Event &event) override; + bool Abort() override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; Error TakeOff(bool printMsg); diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h index 24ac7ad6..5a8a6c32 100644 --- a/src/object/auto/autoconvert.h +++ b/src/object/auto/autoconvert.h @@ -42,17 +42,17 @@ public: CAutoConvert(COldObject* object); ~CAutoConvert(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); - bool Abort(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; + bool Abort() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: CObject* SearchStone(ObjectType type); diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h index 1b22c6c7..55af9c2d 100644 --- a/src/object/auto/autoderrick.h +++ b/src/object/auto/autoderrick.h @@ -42,16 +42,16 @@ public: CAutoDerrick(COldObject* object); ~CAutoDerrick(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: CObject* SearchCargo(); diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h index ec7bc558..c193a775 100644 --- a/src/object/auto/autodestroyer.h +++ b/src/object/auto/autodestroyer.h @@ -42,18 +42,18 @@ public: CAutoDestroyer(COldObject* object); ~CAutoDestroyer(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - Error StartAction(int param); + Error StartAction(int param) override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: CObject* SearchPlastic(); diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h index 82566bfd..2b2ab03e 100644 --- a/src/object/auto/autofactory.h +++ b/src/object/auto/autofactory.h @@ -43,18 +43,18 @@ public: CAutoFactory(COldObject* object); ~CAutoFactory(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); + void Init() override; + bool EventProcess(const Event &event) override; - Error StartAction(int param); + Error StartAction(int param) override; void SetProgram(const std::string& program); - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void UpdateInterface(); diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h index 3eced516..d465b1b4 100644 --- a/src/object/auto/autoflag.h +++ b/src/object/auto/autoflag.h @@ -30,12 +30,12 @@ public: CAutoFlag(COldObject* object); ~CAutoFlag(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - void Start(int param); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + void Start(int param) override; + bool EventProcess(const Event &event) override; + Error GetError() override; protected: float m_strong = 0.0f; diff --git a/src/object/auto/autohouston.h b/src/object/auto/autohouston.h index 2f95228e..08c18de8 100644 --- a/src/object/auto/autohouston.h +++ b/src/object/auto/autohouston.h @@ -46,15 +46,15 @@ public: CAutoHouston(COldObject* object); ~CAutoHouston(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - void Start(int param); - bool EventProcess(const Event &event); - bool Abort(); - Error GetError(); + void Init() override; + void Start(int param) override; + bool EventProcess(const Event &event) override; + bool Abort() override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; protected: float m_progress = 0.0f; diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 8bf63c9e..85aeb818 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -47,17 +47,17 @@ public: CAutoLabo(COldObject* object); ~CAutoLabo(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - Error StartAction(int param); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + Error StartAction(int param) override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void UpdateInterface(); diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h index f0e2840f..d629be49 100644 --- a/src/object/auto/automush.h +++ b/src/object/auto/automush.h @@ -41,14 +41,14 @@ public: CAutoMush(COldObject* object); ~CAutoMush(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: bool SearchTarget(); diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h index fc61d741..d03490b0 100644 --- a/src/object/auto/autonest.h +++ b/src/object/auto/autonest.h @@ -39,14 +39,14 @@ public: CAutoNest(COldObject* object); ~CAutoNest(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: bool SearchFree(Math::Vector pos); diff --git a/src/object/auto/autonuclearplant.h b/src/object/auto/autonuclearplant.h index 50a5ac00..5654fddd 100644 --- a/src/object/auto/autonuclearplant.h +++ b/src/object/auto/autonuclearplant.h @@ -42,16 +42,16 @@ public: CAutoNuclearPlant(COldObject* object); ~CAutoNuclearPlant(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: CObject* SearchUranium(); diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h index f101cdd5..8f304fe4 100644 --- a/src/object/auto/autoportico.h +++ b/src/object/auto/autoportico.h @@ -43,13 +43,13 @@ public: CAutoPortico(COldObject* object); ~CAutoPortico(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - void Start(int param); - bool EventProcess(const Event &event); - bool Abort(); - Error GetError(); + void Init() override; + void Start(int param) override; + bool EventProcess(const Event &event) override; + bool Abort() override; + Error GetError() override; protected: void UpdateTrackMapping(float left, float right); diff --git a/src/object/auto/autopowercaptor.h b/src/object/auto/autopowercaptor.h index 4991e830..d85236e0 100644 --- a/src/object/auto/autopowercaptor.h +++ b/src/object/auto/autopowercaptor.h @@ -39,17 +39,17 @@ public: CAutoPowerCaptor(COldObject* object); ~CAutoPowerCaptor(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; void StartLightning(); - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void ChargeObject(float rTime); diff --git a/src/object/auto/autopowerplant.h b/src/object/auto/autopowerplant.h index a85684eb..4bc19919 100644 --- a/src/object/auto/autopowerplant.h +++ b/src/object/auto/autopowerplant.h @@ -43,16 +43,16 @@ public: CAutoPowerPlant(COldObject* object); ~CAutoPowerPlant(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void UpdateInterface(float rTime); diff --git a/src/object/auto/autopowerstation.h b/src/object/auto/autopowerstation.h index 999f95d8..305524f2 100644 --- a/src/object/auto/autopowerstation.h +++ b/src/object/auto/autopowerstation.h @@ -31,13 +31,13 @@ public: CAutoPowerStation(COldObject* object); ~CAutoPowerStation(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; protected: void UpdateInterface(float rTime); diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h index f7505770..eafe0607 100644 --- a/src/object/auto/autoradar.h +++ b/src/object/auto/autoradar.h @@ -40,12 +40,12 @@ public: CAutoRadar(COldObject* object); ~CAutoRadar(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - bool CreateInterface(bool bSelect); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + bool CreateInterface(bool bSelect) override; + Error GetError() override; protected: void UpdateInterface(); diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h index acaceecc..7fc4214b 100644 --- a/src/object/auto/autorepair.h +++ b/src/object/auto/autorepair.h @@ -42,16 +42,16 @@ public: CAutoRepair(COldObject* object); ~CAutoRepair(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: CObject* SearchVehicle(); diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index b29704b4..e0f1643e 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -39,17 +39,17 @@ public: CAutoResearch(COldObject* object); ~CAutoResearch(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - Error StartAction(int result); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + Error StartAction(int result) override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void UpdateInterface(); diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h index 4421acbd..6692ee60 100644 --- a/src/object/auto/autoroot.h +++ b/src/object/auto/autoroot.h @@ -30,11 +30,11 @@ public: CAutoRoot(COldObject* object); ~CAutoRoot(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; protected: diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h index 2ee3a569..99325831 100644 --- a/src/object/auto/autotower.h +++ b/src/object/auto/autotower.h @@ -42,16 +42,16 @@ public: CAutoTower(COldObject* object); ~CAutoTower(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: void UpdateInterface(float rTime); diff --git a/src/object/auto/autovault.h b/src/object/auto/autovault.h index 28f1e02b..c56216e4 100644 --- a/src/object/auto/autovault.h +++ b/src/object/auto/autovault.h @@ -40,16 +40,16 @@ public: CAutoVault(COldObject* object); ~CAutoVault(); - void DeleteObject(bool bAll=false); + void DeleteObject(bool bAll=false) override; - void Init(); - bool EventProcess(const Event &event); - Error GetError(); + void Init() override; + bool EventProcess(const Event &event) override; + Error GetError() override; - bool CreateInterface(bool bSelect); + bool CreateInterface(bool bSelect) override; - bool Write(CLevelParserLine* line); - bool Read(CLevelParserLine* line); + bool Write(CLevelParserLine* line) override; + bool Read(CLevelParserLine* line) override; protected: int CountKeys(); diff --git a/src/object/motion/motionant.h b/src/object/motion/motionant.h index 3fe8940e..c216ddf7 100644 --- a/src/object/motion/motionant.h +++ b/src/object/motion/motionant.h @@ -50,9 +50,9 @@ public: CMotionAnt(COldObject* object); ~CMotionAnt(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; protected: void CreatePhysics(); diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h index 6ecb9b7d..0d02b148 100644 --- a/src/object/motion/motionbee.h +++ b/src/object/motion/motionbee.h @@ -44,9 +44,9 @@ public: CMotionBee(COldObject* object); ~CMotionBee(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; protected: void CreatePhysics(); diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h index 57f62919..89e38cd9 100644 --- a/src/object/motion/motionhuman.h +++ b/src/object/motion/motionhuman.h @@ -62,10 +62,10 @@ public: CMotionHuman(COldObject* object); ~CMotionHuman(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); - Error SetAction(int action, float time=0.2f); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; + Error SetAction(int action, float time=0.2f) override; void StartDisplayPerso(); void StopDisplayPerso(); diff --git a/src/object/motion/motionlevelcontroller.h b/src/object/motion/motionlevelcontroller.h index 1dc70a58..2435331f 100644 --- a/src/object/motion/motionlevelcontroller.h +++ b/src/object/motion/motionlevelcontroller.h @@ -28,6 +28,6 @@ public: CMotionLevelController(COldObject* object); ~CMotionLevelController(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; }; diff --git a/src/object/motion/motionqueen.h b/src/object/motion/motionqueen.h index a1f707ba..2fe0d3cf 100644 --- a/src/object/motion/motionqueen.h +++ b/src/object/motion/motionqueen.h @@ -30,9 +30,9 @@ public: CMotionQueen(COldObject* object); ~CMotionQueen(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; protected: void CreatePhysics(); diff --git a/src/object/motion/motionspider.h b/src/object/motion/motionspider.h index 9bc963ff..336f7419 100644 --- a/src/object/motion/motionspider.h +++ b/src/object/motion/motionspider.h @@ -48,9 +48,9 @@ public: CMotionSpider(COldObject* object); ~CMotionSpider(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; protected: void CreatePhysics(); diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h index d64dd767..a06d334a 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -39,10 +39,10 @@ public: CMotionToto(COldObject* object); ~CMotionToto(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); - Error SetAction(int action, float time=0.2f); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; + Error SetAction(int action, float time=0.2f) override; void SetLinkType(ObjectType type); void StartDisplayInfo(); diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 1beff877..d251f384 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -29,9 +29,9 @@ public: CMotionVehicle(COldObject* object); ~CMotionVehicle(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; protected: void CreatePhysics(ObjectType type); diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h index 86e1e9c8..3b4746e1 100644 --- a/src/object/motion/motionworm.h +++ b/src/object/motion/motionworm.h @@ -30,12 +30,12 @@ public: CMotionWorm(COldObject* object); ~CMotionWorm(); - void DeleteObject(bool bAll=false); - void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager); - bool EventProcess(const Event &event); + void DeleteObject(bool bAll=false) override; + void Create(Math::Vector pos, float angle, ObjectType type, float power, Gfx::COldModelManager* modelManager) override; + bool EventProcess(const Event &event) override; - bool SetParam(int rank, float value); - float GetParam(int rank); + bool SetParam(int rank, float value) override; + float GetParam(int rank) override; protected: void CreatePhysics(); diff --git a/src/object/task/task.h b/src/object/task/task.h index 252ba7df..1ca1cdf6 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -99,7 +99,7 @@ public: CForegroundTask(COldObject* object) : CTask(object) {} bool IsBackground() final { return false; } - virtual bool IsPilot() { return false; } + bool IsPilot() override { return false; } }; class CBackgroundTask : public CTask diff --git a/src/object/task/taskadvance.h b/src/object/task/taskadvance.h index 50437bae..3cfa6914 100644 --- a/src/object/task/taskadvance.h +++ b/src/object/task/taskadvance.h @@ -32,10 +32,10 @@ public: CTaskAdvance(COldObject* object); ~CTaskAdvance(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(float length); - Error IsEnded(); + Error IsEnded() override; protected: float m_totalLength = 0.0f; diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 81a07378..b8145fd3 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -53,11 +53,11 @@ public: CTaskBuild(COldObject* object); ~CTaskBuild(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(ObjectType type); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: Error FlatFloor(); diff --git a/src/object/task/taskdeletemark.h b/src/object/task/taskdeletemark.h index 06036307..4c4c522a 100644 --- a/src/object/task/taskdeletemark.h +++ b/src/object/task/taskdeletemark.h @@ -29,11 +29,11 @@ public: CTaskDeleteMark(COldObject* object); ~CTaskDeleteMark(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: void DeleteMark(); diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index 3feb5e4b..95e169a2 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -30,12 +30,12 @@ public: CTaskFire(COldObject* object); ~CTaskFire(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(float delay); - Error IsEnded(); - bool Abort(); - bool IsPilot(); + Error IsEnded() override; + bool Abort() override; + bool IsPilot() override; protected: float m_delay = 0.0f; diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 6ed8f4e0..f72a91a8 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -42,11 +42,11 @@ public: CTaskFireAnt(COldObject* object); ~CTaskFireAnt(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(Math::Vector impact); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: diff --git a/src/object/task/taskflag.h b/src/object/task/taskflag.h index d69f92b8..34cfc923 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -42,11 +42,11 @@ public: CTaskFlag(COldObject* object); ~CTaskFlag(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(TaskFlagOrder order, int rank); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: Error CreateFlag(int rank); diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index db3fcb46..3ee24aec 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -79,10 +79,10 @@ public: CTaskGoto(COldObject* object); ~CTaskGoto(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(Math::Vector goal, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode); - Error IsEnded(); + Error IsEnded() override; protected: CObject* WormSearch(Math::Vector &impact); diff --git a/src/object/task/taskgungoal.h b/src/object/task/taskgungoal.h index 224c3b06..9ccfd780 100644 --- a/src/object/task/taskgungoal.h +++ b/src/object/task/taskgungoal.h @@ -30,11 +30,11 @@ public: CTaskGunGoal(COldObject* object); ~CTaskGunGoal(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(float dirV, float dirH); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: float m_progress = 0.0f; diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index 40280123..42e86ca3 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -62,11 +62,11 @@ public: CTaskManip(COldObject* object); ~CTaskManip(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(TaskManipOrder order, TaskManipArm arm); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: void InitAngle(); diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index d2a0fcd0..98d107c5 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -42,11 +42,11 @@ public: CTaskPen(COldObject* object); ~CTaskPen(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(bool bDown, TraceColor color); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: void SoundManip(float time, float amplitude, float frequency); diff --git a/src/object/task/taskrecover.h b/src/object/task/taskrecover.h index 79024491..8f853503 100644 --- a/src/object/task/taskrecover.h +++ b/src/object/task/taskrecover.h @@ -43,11 +43,11 @@ public: CTaskRecover(COldObject* object); ~CTaskRecover(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: CObject* SearchRuin(); diff --git a/src/object/task/tasksearch.h b/src/object/task/tasksearch.h index 4cf15b7e..4e91a928 100644 --- a/src/object/task/tasksearch.h +++ b/src/object/task/tasksearch.h @@ -47,11 +47,11 @@ public: CTaskSearch(COldObject* object); ~CTaskSearch(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: void InitAngle(); diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index fd133a94..4c477381 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -57,12 +57,12 @@ public: CTaskShield(COldObject* object); ~CTaskShield(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(TaskShieldMode mode, float delay); - Error IsEnded(); - bool IsBusy(); - bool Abort(); + Error IsEnded() override; + bool IsBusy() override; + bool Abort() override; float GetActiveRadius(); diff --git a/src/object/task/taskspiderexplo.h b/src/object/task/taskspiderexplo.h index 4ece92d6..323d1aa0 100644 --- a/src/object/task/taskspiderexplo.h +++ b/src/object/task/taskspiderexplo.h @@ -30,11 +30,11 @@ public: CTaskSpiderExplo(COldObject* object); ~CTaskSpiderExplo(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: float m_time = 0.0f; diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index 19d78a33..6d5c09d7 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -48,11 +48,11 @@ public: CTaskTake(COldObject* object); ~CTaskTake(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: CObject* SearchTakeObject(float &angle, float dLimit, float aLimit); diff --git a/src/object/task/taskterraform.h b/src/object/task/taskterraform.h index 5fb4e754..4ff6f035 100644 --- a/src/object/task/taskterraform.h +++ b/src/object/task/taskterraform.h @@ -41,11 +41,11 @@ public: CTaskTerraform(COldObject* object); ~CTaskTerraform(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(); - Error IsEnded(); - bool Abort(); + Error IsEnded() override; + bool Abort() override; protected: bool Terraform(); diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index ae402c67..14019a07 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -30,10 +30,10 @@ public: CTaskTurn(COldObject* object); ~CTaskTurn(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(float angle); - Error IsEnded(); + Error IsEnded() override; protected: float m_angle = 0.0f; diff --git a/src/object/task/taskwait.h b/src/object/task/taskwait.h index 259e62af..2fbed7a0 100644 --- a/src/object/task/taskwait.h +++ b/src/object/task/taskwait.h @@ -30,10 +30,10 @@ public: CTaskWait(COldObject* object); ~CTaskWait(); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; Error Start(float time); - Error IsEnded(); + Error IsEnded() override; protected: float m_waitTime = 0.0f; diff --git a/src/ui/controls/button.h b/src/ui/controls/button.h index dd0af5dc..76232813 100644 --- a/src/ui/controls/button.h +++ b/src/ui/controls/button.h @@ -32,11 +32,11 @@ public: CButton(); virtual ~CButton(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; void SetImmediat(bool bRepeat); bool GetImmediat(); diff --git a/src/ui/controls/check.h b/src/ui/controls/check.h index c0aa3667..8a22a5ab 100644 --- a/src/ui/controls/check.h +++ b/src/ui/controls/check.h @@ -36,11 +36,11 @@ public: CCheck(); virtual ~CCheck(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; }; } diff --git a/src/ui/controls/color.h b/src/ui/controls/color.h index 9cc0169d..1d4c34ba 100644 --- a/src/ui/controls/color.h +++ b/src/ui/controls/color.h @@ -37,11 +37,11 @@ public: CColor(); virtual ~CColor(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; void SetRepeat(bool bRepeat); bool GetRepeat(); diff --git a/src/ui/controls/edit.h b/src/ui/controls/edit.h index dcf50c64..8ac6f194 100644 --- a/src/ui/controls/edit.h +++ b/src/ui/controls/edit.h @@ -116,13 +116,13 @@ public: virtual ~CEdit(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - void SetPos(Math::Point pos); - void SetDim(Math::Point dim); + void SetPos(Math::Point pos) override; + void SetDim(Math::Point dim) override; - bool EventProcess(const Event &event); - void Draw(); + bool EventProcess(const Event &event) override; + void Draw() override; void SetText(const char *text, bool bNew=true); void GetText(char *buffer, int max); @@ -176,7 +176,7 @@ public: bool HyperTest(EventType event); bool HyperGo(EventType event); - void SetFontSize(float size); + void SetFontSize(float size) override; bool ClearFormat(); bool SetFormat(int cursor1, int cursor2, int format); diff --git a/src/ui/controls/editvalue.h b/src/ui/controls/editvalue.h index 3d60ecb1..d1e43f0a 100644 --- a/src/ui/controls/editvalue.h +++ b/src/ui/controls/editvalue.h @@ -51,13 +51,13 @@ public: CEditValue(); virtual ~CEditValue(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - void SetPos(Math::Point pos); - void SetDim(Math::Point dim); + void SetPos(Math::Point pos) override; + void SetDim(Math::Point dim) override; - bool EventProcess(const Event &event); - void Draw(); + bool EventProcess(const Event &event) override; + void Draw() override; void SetType(EditValueType type); EditValueType GetType(); diff --git a/src/ui/controls/enumslider.h b/src/ui/controls/enumslider.h index a46b0c7c..8846fcbb 100644 --- a/src/ui/controls/enumslider.h +++ b/src/ui/controls/enumslider.h @@ -39,7 +39,7 @@ public: unsigned int GetVisibleValueIndex(); protected: - std::string GetLabel(); + std::string GetLabel() override; protected: std::vector m_values; diff --git a/src/ui/controls/gauge.h b/src/ui/controls/gauge.h index 5f840cdc..77b78e02 100644 --- a/src/ui/controls/gauge.h +++ b/src/ui/controls/gauge.h @@ -30,11 +30,11 @@ public: CGauge(); virtual ~CGauge(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; void SetLevel(float level); float GetLevel(); diff --git a/src/ui/controls/group.h b/src/ui/controls/group.h index be0a4d84..d3b3798c 100644 --- a/src/ui/controls/group.h +++ b/src/ui/controls/group.h @@ -36,11 +36,11 @@ public: CGroup(); virtual ~CGroup(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; protected: diff --git a/src/ui/controls/image.h b/src/ui/controls/image.h index 1cca2d4b..8d8a06ba 100644 --- a/src/ui/controls/image.h +++ b/src/ui/controls/image.h @@ -37,11 +37,11 @@ public: CImage (); virtual ~CImage(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; void SetFilenameImage(const std::string& name); diff --git a/src/ui/controls/key.h b/src/ui/controls/key.h index c06b5022..c2986db4 100644 --- a/src/ui/controls/key.h +++ b/src/ui/controls/key.h @@ -43,12 +43,12 @@ public: virtual ~CKey(); //! Creates a new key slot button - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; //! Management of an event - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; //! Draws button - void Draw(); + void Draw() override; //! Management of binding //@{ diff --git a/src/ui/controls/label.h b/src/ui/controls/label.h index e6409c0f..c50d41b1 100644 --- a/src/ui/controls/label.h +++ b/src/ui/controls/label.h @@ -34,10 +34,10 @@ public: CLabel(); virtual ~CLabel(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); - bool EventProcess(const Event &event); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; }; diff --git a/src/ui/controls/list.h b/src/ui/controls/list.h index 680bfb07..31a47248 100644 --- a/src/ui/controls/list.h +++ b/src/ui/controls/list.h @@ -99,7 +99,7 @@ protected: private: // Overridden to avoid warning about hiding the virtual function - virtual bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; protected: std::array, LISTMAXDISPLAY> m_buttons; diff --git a/src/ui/controls/map.h b/src/ui/controls/map.h index 52072d16..e1131774 100644 --- a/src/ui/controls/map.h +++ b/src/ui/controls/map.h @@ -72,9 +72,9 @@ public: CMap(); ~CMap(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); - bool EventProcess(const Event &event); - void Draw(); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; + bool EventProcess(const Event &event) override; + void Draw() override; void UpdateTerrain(); void UpdateTerrain(int bx, int by, int ex, int ey); diff --git a/src/ui/controls/scroll.h b/src/ui/controls/scroll.h index 08493df3..7381cfb8 100644 --- a/src/ui/controls/scroll.h +++ b/src/ui/controls/scroll.h @@ -41,17 +41,17 @@ public: CScroll(); ~CScroll(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; - void SetPos(Math::Point pos); - void SetDim(Math::Point dim); + void SetPos(Math::Point pos) override; + void SetDim(Math::Point dim) override; - bool SetState(int state, bool bState); - bool SetState(int state); - bool ClearState(int state); + bool SetState(int state, bool bState) override; + bool SetState(int state) override; + bool ClearState(int state) override; - bool EventProcess(const Event &event); - void Draw(); + bool EventProcess(const Event &event) override; + void Draw() override; void SetVisibleValue(float value); float GetVisibleValue(); diff --git a/src/ui/controls/shortcut.h b/src/ui/controls/shortcut.h index ccb73482..43ce53d8 100644 --- a/src/ui/controls/shortcut.h +++ b/src/ui/controls/shortcut.h @@ -32,11 +32,11 @@ public: CShortcut(); ~CShortcut(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; - bool EventProcess(const Event &event); + bool EventProcess(const Event &event) override; - void Draw(); + void Draw() override; protected: void DrawVertex(int icon, float zoom); diff --git a/src/ui/controls/slider.h b/src/ui/controls/slider.h index 2c45bb93..443b8e39 100644 --- a/src/ui/controls/slider.h +++ b/src/ui/controls/slider.h @@ -34,17 +34,17 @@ public: CSlider(); ~CSlider(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; - void SetPos(Math::Point pos); - void SetDim(Math::Point dim); + void SetPos(Math::Point pos) override; + void SetDim(Math::Point dim) override; - bool SetState(int state, bool bState); - bool SetState(int state); - bool ClearState(int state); + bool SetState(int state, bool bState) override; + bool SetState(int state) override; + bool ClearState(int state) override; - bool EventProcess(const Event &event); - void Draw(); + bool EventProcess(const Event &event) override; + void Draw() override; void SetLimit(float min, float max); diff --git a/src/ui/controls/target.h b/src/ui/controls/target.h index d03aca9f..57efe8e0 100644 --- a/src/ui/controls/target.h +++ b/src/ui/controls/target.h @@ -39,11 +39,11 @@ public: CTarget(); ~CTarget(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg) override; - bool EventProcess(const Event &event); - void Draw(); - bool GetTooltip(Math::Point pos, std::string &name); + bool EventProcess(const Event &event) override; + void Draw() override; + bool GetTooltip(Math::Point pos, std::string &name) override; protected: CObject* DetectFriendObject(Math::Point pos); diff --git a/src/ui/controls/window.h b/src/ui/controls/window.h index e9ac902e..ddd72ab5 100644 --- a/src/ui/controls/window.h +++ b/src/ui/controls/window.h @@ -79,7 +79,7 @@ public: EventType GetEventTypeFull(); EventType GetEventTypeClose(); - virtual void SetName(std::string name, bool tooltip = true) override; + void SetName(std::string name, bool tooltip = true) override; void SetTrashEvent(bool bTrash); bool GetTrashEvent();