From 2d97a4b9d7c6d84cb8b22302cd22f805a4ab76b0 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 29 Jan 2024 21:53:25 +0100 Subject: Apply readability-delete-null-pointer fixits These checks are unnecessary as deleting a null pointer has no effect. --- src/being.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index d6b36cc6..ef07684f 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -297,9 +297,7 @@ void Being::setSpeech(const std::string &text, int time) const int speech = config.getIntValue("speech"); if (speech == TEXT_OVERHEAD) { - if (mText) - delete mText; - + delete mText; mText = new Text(mSpeech, getPixelX(), getSpeechTextYPosition(), gcn::Graphics::CENTER, @@ -912,11 +910,8 @@ void Being::drawSpeech(int offsetX, int offsetY) { const bool showName = (speech == NAME_IN_BUBBLE); - if (mText) - { - delete mText; - mText = nullptr; - } + delete mText; + mText = nullptr; mSpeechBubble->setCaption(showName ? mName : "", mTextColor); @@ -943,9 +938,7 @@ void Being::drawSpeech(int offsetX, int offsetY) { mSpeechBubble->setVisible(false); - if (mText) - delete mText; - + delete mText; mText = nullptr; } } -- cgit v1.2.3-70-g09d2