summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-11 00:12:43 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-11 00:12:43 +0300
commit368afa4bc05e5b66e521b6c881cd8e8f260cf5df (patch)
treeec9bd6a3c992c46550ad9aa396f10862257db68d /src/being
parentee75580d40c5c444d184a6ecbeb99493ba42085a (diff)
downloadmv-368afa4bc05e5b66e521b6c881cd8e8f260cf5df.tar.gz
mv-368afa4bc05e5b66e521b6c881cd8e8f260cf5df.tar.bz2
mv-368afa4bc05e5b66e521b6c881cd8e8f260cf5df.tar.xz
mv-368afa4bc05e5b66e521b6c881cd8e8f260cf5df.zip
Add missing checks into other files.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp8
-rw-r--r--src/being/playerrelations.h2
2 files changed, 3 insertions, 7 deletions
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;