Ticket #2627: 2627.4.patch

simulation2/components/CCmpSelectable.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -114 +114 @@
 
         // Certain special units always have their selection overlay shown
         m_AlwaysVisible = paramNode.GetChild("Overlay").GetChild("AlwaysVisible").IsOk();
-        if (m_AlwaysVisible)
+        if (m_IsInWorld && m_AlwaysVisible)
         {
             m_AlphaMin = MIN_ALPHA_ALWAYS_VISIBLE;
             m_Color.a = m_AlphaMin;
@@ -174 +174 @@
         m_Color.b = color.b;
 
         // Always-visible overlays will be desaturated if their parent unit is deselected.
-        if (m_AlwaysVisible && !selected)
+        if (m_IsInWorld && m_AlwaysVisible && !selected)
         {
             float max;
 
@@ -262 +262 @@
     bool m_AlwaysVisible;
     /// Whether the parent entity is selected (caches GUI's selection state).
     bool m_Selected;
+    /// Whether the entity is in world.
+    bool m_IsInWorld;
     /// Current selection overlay color. Alpha component is subject to fading.
     CColor m_Color;
     /// Whether the selectable's player colour has been cached for rendering.
@@ -345 +347 @@
             break;
         }
     case MT_PositionChanged:
+    {
+        const CMessagePositionChanged& data = static_cast<const CMessagePositionChanged&> (msg);
+
+        m_IsInWorld = data.inWorld; 
+    }
     case MT_TerrainChanged:
     case MT_WaterChanged:
         {