abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix selection rings while garrisoning

Browse Source 
Differential Revision: https://code.wildfiregames.com/D1158
Reviewed by: elexis, Itms
Refs: #2627

This was SVN commit r21241.
This commit is contained in:
temple 2018-02-17 16:56:12 +00:00
parent 668da1b0d1
commit 7c8c4ac2f7
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/simulation2/components/CCmpSelectable.cpp
View File

@ -349,19 +349,6 @@ void CCmpSelectable::HandleMessage(const CMessage& msg, bool UNUSED(global))
break;
}
case MT_PositionChanged:
{
if (m_AlwaysVisible)
{
const CMessagePositionChanged& msgData = static_cast<const CMessagePositionChanged&> (msg);
if (!msgData.inWorld)
m_Color.a = m_AlphaMin = MIN_ALPHA_UNSELECTED;
else if (!m_Selected)
m_Color.a = m_AlphaMin = MIN_ALPHA_ALWAYS_VISIBLE;
}
InvalidateStaticOverlay();
break;
}
case MT_TerrainChanged:
case MT_WaterChanged:
InvalidateStaticOverlay();

15
source/simulation2/components/CCmpUnitRenderer.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Wildfire Games.
/* Copyright (C) 2018 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -397,7 +397,13 @@ void CCmpUnitRenderer::RenderSubmit(SceneCollector& collector, const CFrustum& f
unit.culled = true;
if (!(unit.actor && unit.inWorld))
if (!unit.actor)
continue;
if (unit.visibilityDirty)
UpdateVisibility(unit);
if (unit.visibility == ICmpRangeManager::VIS_HIDDEN)
continue;
if (!g_AtlasGameLoop->running && !g_RenderActors && (unit.flags & ACTOR_ONLY))
@ -409,11 +415,6 @@ void CCmpUnitRenderer::RenderSubmit(SceneCollector& collector, const CFrustum& f
if (culling && !frustum.IsSphereVisible(unit.sweptBounds.GetCenter(), unit.sweptBounds.GetRadius()))
continue;
if (unit.visibilityDirty)
UpdateVisibility(unit);
if (unit.visibility == ICmpRangeManager::VIS_HIDDEN)
continue;
unit.culled = false;
CModelAbstract& unitModel = unit.actor->GetModel();