Ticket #2627: 2627.2.diff

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
@@ -111 +111 @@
     virtual void Init(const CParamNode& paramNode)
     {
         m_EditorOnly = paramNode.GetChild("EditorOnly").IsOk();
+        CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle());
 
         // Certain special units always have their selection overlay shown
         m_AlwaysVisible = paramNode.GetChild("Overlay").GetChild("AlwaysVisible").IsOk();
-        if (m_AlwaysVisible)
+        if ((!cmpPosition || cmpPosition->IsInWorld()) && m_AlwaysVisible)
         {
             m_AlphaMin = MIN_ALPHA_ALWAYS_VISIBLE;
             m_Color.a = m_AlphaMin;
@@ -172 +173 @@
         m_Color.r = color.r;
         m_Color.g = color.g;
         m_Color.b = color.b;
+        CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle());
 
         // Always-visible overlays will be desaturated if their parent unit is deselected.
-        if (m_AlwaysVisible && !selected)
+        if ((!cmpPosition || cmpPosition->IsInWorld()) && m_AlwaysVisible && !selected)
         {
             float max;