From 0ff5548da398fa389db6a81f3e2fea9d4fc74e73 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 14 Jul 2016 18:59:14 +0300 Subject: Use branch prediction macro in Being::logic. --- src/being/being.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/being') diff --git a/src/being/being.cpp b/src/being/being.cpp index cfb182355..95142fecc 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1760,13 +1760,18 @@ void Being::nextTile() restrict2 void Being::logic() restrict2 { BLOCK_START("Being::logic") - // Reduce the time that speech is still displayed - if (mSpeechTime > 0) + if (A_UNLIKELY(mSpeechTime != 0)) + { mSpeechTime--; - - // Remove text and speechbubbles if speech boxes aren't being used - if (mSpeechTime == 0 && mText) - delete2(mText) + if (mSpeechTime == 0 && mText != nullptr) + { + delete2(mText) + } + else if (mText != nullptr) + { + delete2(mText) + } + } const int time = tick_time * MILLISECONDS_IN_A_TICK; if (mEmotionSprite) -- cgit v1.2.3-60-g2f50