Changeset 729

Timestamp:

07/15/10 17:55:27 (7 weeks ago)

Author:

Xynth

Message:

Ticket #104 This patch grays out minimap He3 info when there is no eye in the sector detecting He3 changes. Also changes He3 asteroid label to gray or white instead of white or green.

Location:

branch/FAZR6/src/WinTrek

Files:

• radarimage.cpp (modified) (1 diff)
• sectormap.cpp (modified) (2 diffs)

branch/FAZR6/src/WinTrek/radarimage.cpp

@@ -996 +996 @@
                                         fill = 1.0f;
 
+                                                                        //Xynth #104 Color asteroids white/gray to match minimap
                                                                         if (((IasteroidIGC*)pmodel)->GetAsteroidCurrentEye(psideMine))
-                                                                                color = Color::Green();
+                                                                                color = Color::White();
+                                                                        else
+                                                                                color = Color::Gray();
 
                                 }

branch/FAZR6/src/WinTrek/sectormap.cpp

@@ -352 +352 @@
         return fOre;
     }
+
+        //Xynth #104 7/2010  Returns true if at least one He3 is eyed
+        bool HeliumAsteroidVisibileInCluster(IclusterIGC* pcluster)
+        {
+                bool HeSpotted = false;
+                IsideIGC*   psideMine = trekClient.GetShip()->GetSide();
+        for (AsteroidLinkIGC* asteriodLink = pcluster->GetAsteroids()->first();
+            asteriodLink != NULL; asteriodLink = asteriodLink->next())
+        {
+            AsteroidAbilityBitMask aabm = asteriodLink->data()->GetCapabilities();
+
+            // if we can mine helium at this asteroid
+            if ((aabm & c_aabmMineHe3) != 0)
+            {
+                if (asteriodLink->data()->GetAsteroidCurrentEye(psideMine))
+                                        HeSpotted = true;
+            }
+        }
+                return HeSpotted;
+        }  //End #104 function
 
     void Render(Context* pcontext)
@@ -458 +478 @@
                 Point ptAsteroids(xSecondColumn, yTop - 45);
 
+                                //Xynth #104 7/2010
+                                Color color;
+                                if (HeliumAsteroidVisibileInCluster(m_pClusterSel))
+                                        color = Color::White();
+                                else
+                                        color = Color::Gray();
+
                 // draw the helium count
                 pcontext->DrawString(
                     pfont,
-                    Color::White(),
+                    color, //Xynth #104 7/2010 Color::White(),
                     ptHelium,
                     "He3: " + ZString(int(GetHeliumInCluster(m_pClusterSel)))