diff --git a/source/code/TextManager.hpp b/source/code/TextManager.hpp index 67c5051..a489476 100644 --- a/source/code/TextManager.hpp +++ b/source/code/TextManager.hpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/ Source information and contacts persons can be found at -http://www.blockattack.net +https://blockattack.net =========================================================================== */ @@ -31,7 +31,7 @@ class TextMessage { private: int x = 0; int y = 0; - unsigned int textt; + unsigned int textt = 0; unsigned long int time = 0; unsigned long int placeTime = 0; //Then the text was placed public: diff --git a/source/code/sago/SagoDataHolder.hpp b/source/code/sago/SagoDataHolder.hpp index 068650a..3c126aa 100644 --- a/source/code/sago/SagoDataHolder.hpp +++ b/source/code/sago/SagoDataHolder.hpp @@ -49,7 +49,7 @@ private: }; -class MusicHandler { +class MusicHandler final { public: MusicHandler() {}; MusicHandler(const SagoDataHolder* holder, const std::string &musicName); @@ -62,7 +62,7 @@ private: }; -class SoundHandler { +class SoundHandler final { public: SoundHandler() {}; SoundHandler(const SagoDataHolder* holder, const std::string &soundName); @@ -74,7 +74,7 @@ private: Uint64 version = 0; }; -class SagoDataHolder { +class SagoDataHolder final { public: /** * The renderer must be set before requesting a texture. @@ -112,7 +112,7 @@ public: * @return A globally unique number. */ Uint64 getVersion() const; - virtual ~SagoDataHolder(); + ~SagoDataHolder(); private: SagoDataHolder(const SagoDataHolder& base) = delete; SagoDataHolder& operator=(const SagoDataHolder& base) = delete; diff --git a/source/code/sago/SagoSprite.hpp b/source/code/sago/SagoSprite.hpp index c66fd87..688770a 100644 --- a/source/code/sago/SagoSprite.hpp +++ b/source/code/sago/SagoSprite.hpp @@ -29,7 +29,7 @@ SOFTWARE. namespace sago { -class SagoSprite { +class SagoSprite final { public: SagoSprite(); SagoSprite(const SagoDataHolder &texHolder, const std::string &texture,const SDL_Rect& initImage,const int animationFrames, const int animationFrameLength); @@ -76,7 +76,7 @@ public: SagoSprite& operator=(const SagoSprite& base); int GetWidth() const; int GetHeight() const; - virtual ~SagoSprite(); + ~SagoSprite(); private: struct SagoSpriteData; SagoSpriteData *data; diff --git a/source/code/sago/SagoSpriteHolder.hpp b/source/code/sago/SagoSpriteHolder.hpp index 7e2924c..21b093e 100644 --- a/source/code/sago/SagoSpriteHolder.hpp +++ b/source/code/sago/SagoSpriteHolder.hpp @@ -30,10 +30,10 @@ SOFTWARE. namespace sago { -class SagoSpriteHolder { +class SagoSpriteHolder final { public: explicit SagoSpriteHolder(const SagoDataHolder &texHolder); - virtual ~SagoSpriteHolder(); + ~SagoSpriteHolder(); void ReadSprites(); const sago::SagoSprite& GetSprite(const std::string &spritename) const; const SagoDataHolder& GetDataHolder() const; diff --git a/source/code/sago/SagoTextBox.hpp b/source/code/sago/SagoTextBox.hpp index 5aeae4c..906fae2 100644 --- a/source/code/sago/SagoTextBox.hpp +++ b/source/code/sago/SagoTextBox.hpp @@ -30,10 +30,10 @@ SOFTWARE. namespace sago { -class SagoTextBox { +class SagoTextBox final { public: SagoTextBox(); - virtual ~SagoTextBox(); + ~SagoTextBox(); void SetHolder(const SagoDataHolder* holder); void SetText(const char* text); void SetText(const std::string& text); diff --git a/source/code/sago/SagoTextField.hpp b/source/code/sago/SagoTextField.hpp index ad24dc1..f3af800 100644 --- a/source/code/sago/SagoTextField.hpp +++ b/source/code/sago/SagoTextField.hpp @@ -38,13 +38,13 @@ namespace sago { * Normally all values will be set at the beginning before text is drawn. * SetHolder MUST be called before the field is drawn! */ -class SagoTextField { +class SagoTextField final { public: SagoTextField(); SagoTextField(SagoTextField&& o) noexcept; SagoTextField& operator=(const SagoTextField&& base) = delete; SagoTextField& operator=(const SagoTextField& base) = delete; - virtual ~SagoTextField(); + ~SagoTextField(); /** * This method creates a copy of a given font. * The cache will not be copied.