Skip to content

Commit 532b2e2

Browse files
committed
Merge pull request OpenXcom#823 from winterheart/ui-improvement
Draw Bases names in detailed zoom.
2 parents 64682ff + fca30a6 commit 532b2e2

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

‎src/Geoscape/Globe.cpp‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ void Globe::drawDetail()
13941394
delete label;
13951395
}
13961396

1397-
// Draw the city markers
1397+
// Draw the city and base markers
13981398
if (_zoom >= 3)
13991399
{
14001400
Text *label = new Text(80, 9, 0, 0);
@@ -1426,6 +1426,18 @@ void Globe::drawDetail()
14261426
label->blit(_countries);
14271427
}
14281428
}
1429+
// Draw bases names
1430+
for (std::vector<Base*>::iterator j = _game->getSavedGame()->getBases()->begin(); j != _game->getSavedGame()->getBases()->end(); ++j)
1431+
{
1432+
if (pointBack((*j)->getLongitude(), (*j)->getLatitude()))
1433+
continue;
1434+
polarToCart((*j)->getLongitude(), (*j)->getLatitude(), &x, &y);
1435+
label->setX(x - 40);
1436+
label->setY(y + 2);
1437+
label->setColor(Palette::blockOffset(8)+5);
1438+
label->setText((*j)->getName());
1439+
label->blit(_countries);
1440+
}
14291441

14301442
delete label;
14311443
}

0 commit comments

Comments
 (0)