summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-11 14:48:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-11 15:24:57 +0300
commitf1b82c1b06604c2c1eed750a6c980aa0b5355560 (patch)
tree3e524583691af0e5a17e5ee974439b4c6ea07ef4 /src/being
parent452f2489bf3225235797ea08ea0d466f80409a87 (diff)
downloadmanaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.gz
manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.bz2
manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.tar.xz
manaplus-f1b82c1b06604c2c1eed750a6c980aa0b5355560.zip
First part of checks from Parasoft C++ Test.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp3
-rw-r--r--src/being/localplayer.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 94e94161e..03ed2ad89 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1849,7 +1849,8 @@ void Being::updateColors()
{
mNameColor = &userPalette->getColor(UserPalette::MONSTER);
}
- else if (mParty && mParty == player_node->getParty())
+ else if (mParty && player_node
+ && mParty == player_node->getParty())
{
mNameColor = &userPalette->getColor(UserPalette::PARTY);
}
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 787d59038..ee77c9831 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -258,7 +258,7 @@ void LocalPlayer::logic()
{
MessagePair info = mMessages.front();
- if (particleEngine)
+ if (particleEngine && gui)
{
particleEngine->addTextRiseFadeOutEffect(
info.first,