Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

(CC) Remove unused hb and hp FinalGlideBelowLandable

  • Loading branch information...
commit 50d1a66fbd83e06b65226821a85ebcf6e23d2b00 1 parent c269256
@pventafridda pventafridda authored
View
2  Common/Header/MapWindow.h
@@ -588,7 +588,6 @@ class MapWindow {
static HPEN hpThermalBandGlider;
static HPEN hpFinalGlideAbove;
static HPEN hpFinalGlideBelow;
- static HPEN hpFinalGlideBelowLandable;
static HPEN hpMapScale;
static HPEN hpMapScale2;
static HPEN hpTerrainLine;
@@ -605,7 +604,6 @@ class MapWindow {
static HBRUSH hbThermalBand;
static HBRUSH hbBestCruiseTrack;
static HBRUSH hbFinalGlideBelow;
- static HBRUSH hbFinalGlideBelowLandable;
static HBRUSH hbFinalGlideAbove;
static HBRUSH hbWind;
View
23 Common/Source/Draw/DrawFinalGlideBar.cpp
@@ -162,18 +162,8 @@ void MapWindow::DrawFinalGlide(HDC hDC, const RECT rc)
// draw actual glide bar
if (Offset<=0) {
- #if 0 // 111108 No more use of LandableReachable
- if (LandableReachable && (OvertargetMode==OVT_TASK)) { //@ 101004
- hpOld = (HPEN)SelectObject(hDC, hpFinalGlideBelowLandable);
- hbOld = (HBRUSH)SelectObject(hDC, hbFinalGlideBelowLandable);
- } else {
- hpOld = (HPEN)SelectObject(hDC, hpFinalGlideBelow);
- hbOld = (HBRUSH)SelectObject(hDC, hbFinalGlideBelow);
- }
- #else
hpOld = (HPEN)SelectObject(hDC, hpFinalGlideBelow);
hbOld = (HBRUSH)SelectObject(hDC, hbFinalGlideBelow);
- #endif
} else {
hpOld = (HPEN)SelectObject(hDC, hpFinalGlideAbove);
hbOld = (HBRUSH)SelectObject(hDC, hbFinalGlideAbove);
@@ -184,17 +174,8 @@ void MapWindow::DrawFinalGlide(HDC hDC, const RECT rc)
// we dont have mc0 calc ready for other overtargets, not granted at least
if (OvertargetMode == OVT_TASK) {
if (Offset0<=0) {
-#if 0
- if (LandableReachable) {
- SelectObject(hDC, hpFinalGlideBelowLandable);
- SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
- } else {
-#endif
- SelectObject(hDC, hpFinalGlideBelow);
- SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
-#if 0
- }
-#endif
+ SelectObject(hDC, hpFinalGlideBelow);
+ SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
} else {
SelectObject(hDC, hpFinalGlideAbove);
SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
View
2  Common/Source/Draw/MapWndProc.cpp
@@ -118,7 +118,6 @@ HBRUSH MapWindow::hbCompass;
HBRUSH MapWindow::hbThermalBand;
HBRUSH MapWindow::hbBestCruiseTrack;
HBRUSH MapWindow::hbFinalGlideBelow;
-HBRUSH MapWindow::hbFinalGlideBelowLandable;
HBRUSH MapWindow::hbFinalGlideAbove;
HBRUSH MapWindow::hbWind;
@@ -135,7 +134,6 @@ HPEN MapWindow::hpThermalBand;
HPEN MapWindow::hpThermalBandGlider;
HPEN MapWindow::hpFinalGlideAbove;
HPEN MapWindow::hpFinalGlideBelow;
-HPEN MapWindow::hpFinalGlideBelowLandable;
HPEN MapWindow::hpMapScale;
HPEN MapWindow::hpMapScale2;
HPEN MapWindow::hpTerrainLine;
View
3  Common/Source/LKObjects.cpp
@@ -171,7 +171,6 @@ void LKObjects_Create() {
MapWindow::hpThermalBand = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(2), RGB(0x40,0x40,0xFF));
MapWindow::hpThermalBandGlider = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(2), RGB(0x00,0x00,0x30));
MapWindow::hpFinalGlideBelow = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(1), RGB(0xFF,0xA0,0xA0)); // another light red
- MapWindow::hpFinalGlideBelowLandable = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(1), RGB(255,196,0)); // another dark yellow
MapWindow::hpFinalGlideAbove = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(1), RGB(0xA0,0xFF,0xA0)); // another light green
MapWindow::hpTerrainLine = (HPEN)CreatePen(PS_DASH, (1), RGB(0x30,0x30,0x30)); // shade
MapWindow::hpTerrainLineBg = (HPEN)CreatePen(PS_SOLID, NIBLSCALE(2), RGB_LCDDARKGREEN); // perimeter
@@ -188,7 +187,6 @@ void LKObjects_Create() {
MapWindow::hbBestCruiseTrack=LKBrush_Blue;
MapWindow::hbFinalGlideBelow=LKBrush_Red;
MapWindow::hbFinalGlideAbove=LKBrush_Green;
- MapWindow::hbFinalGlideBelowLandable=LKBrush_Orange;
MapWindow::hbWind=LKBrush_Grey;
@@ -268,7 +266,6 @@ void LKObjects_Delete() {
if (MapWindow::hpThermalBand) DeleteObject((HPEN)MapWindow::hpThermalBand);
if (MapWindow::hpThermalBandGlider) DeleteObject((HPEN)MapWindow::hpThermalBandGlider);
if (MapWindow::hpFinalGlideBelow) DeleteObject((HPEN)MapWindow::hpFinalGlideBelow);
- if (MapWindow::hpFinalGlideBelowLandable) DeleteObject((HPEN)MapWindow::hpFinalGlideBelowLandable);
if (MapWindow::hpFinalGlideAbove) DeleteObject((HPEN)MapWindow::hpFinalGlideAbove);
if (MapWindow::hpTerrainLine) DeleteObject((HPEN)MapWindow::hpTerrainLine);
if (MapWindow::hpTerrainLineBg) DeleteObject((HPEN)MapWindow::hpTerrainLineBg);
Please sign in to comment.
Something went wrong with that request. Please try again.