From 368afa4bc05e5b66e521b6c881cd8e8f260cf5df Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Jul 2015 00:12:43 +0300 Subject: Add missing checks into other files. --- src/being/being.cpp | 8 ++------ src/being/playerrelations.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/being') diff --git a/src/being/being.cpp b/src/being/being.cpp index 35d5bc9ee..bf05eb7eb 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2581,12 +2581,8 @@ void Being::drawSpriteAt(Graphics *const graphics, if (mDrawHotKeys && !mName.empty()) { - Font *const font = gui->getFont(); - if (font) - { - const Color &color = userPalette->getColor(UserColorId::BEING); - font->drawString(graphics, color, color, mName, x, y); - } + const Color &color = userPalette->getColor(UserColorId::BEING); + gui->getFont()->drawString(graphics, color, color, mName, x, y); } } diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h index 7ead62777..e014071b8 100644 --- a/src/being/playerrelations.h +++ b/src/being/playerrelations.h @@ -150,7 +150,7 @@ class PlayerRelationsManager final * Retrieves a sorted vector of all players for which we have any * relations recorded. */ - StringVect *getPlayers() const A_WARN_UNUSED; + StringVect *getPlayers() const RETURNS_NONNULL A_WARN_UNUSED; StringVect *getPlayersByRelation(const RelationT rel) const A_WARN_UNUSED; -- cgit v1.2.3-60-g2f50