diff options
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.cpp | 3 | ||||
-rw-r--r-- | src/being/localplayer.cpp | 2 |
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, |