[colobot] 85/100: Fix aliens not appearing on the minimap, closes #901
Didier Raboud
odyx at moszumanska.debian.org
Thu Jun 1 18:10:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 149d1f8156fce3579d278c0516ad1f75e0182679
Author: krzys-h <krzys_h at interia.pl>
Date: Tue May 23 20:51:37 2017 +0200
Fix aliens not appearing on the minimap, closes #901
---
src/ui/controls/map.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/ui/controls/map.cpp b/src/ui/controls/map.cpp
index e106209..b22453c 100644
--- a/src/ui/controls/map.cpp
+++ b/src/ui/controls/map.cpp
@@ -1164,12 +1164,20 @@ void CMap::UpdateObject(CObject* pObj)
if ( !m_bEnable ) return;
if ( m_totalFix >= m_totalMove ) return; // full table?
+ type = pObj->GetType();
if ( !pObj->GetDetectable() ) return;
- if ( pObj->Implements(ObjectInterfaceType::Controllable) && !dynamic_cast<CControllableObject*>(pObj)->GetSelectable() ) return;
+ if ( type != OBJECT_MOTHER &&
+ type != OBJECT_ANT &&
+ type != OBJECT_SPIDER &&
+ type != OBJECT_BEE &&
+ type != OBJECT_WORM &&
+ type != OBJECT_MOBILEtg )
+ {
+ if (pObj->Implements(ObjectInterfaceType::Controllable) && !dynamic_cast<CControllableObject*>(pObj)->GetSelectable()) return;
+ }
if ( pObj->GetProxyActivate() ) return;
if (IsObjectBeingTransported(pObj)) return;
- type = pObj->GetType();
pos = pObj->GetPosition();
dir = -(pObj->GetRotationY()+Math::PI/2.0f);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list