Skip to content

Commit 977b5d5

Browse files
committed
Fixes
1 parent b910147 commit 977b5d5

4 files changed

Lines changed: 18 additions & 7 deletions

File tree

‎src/Geoscape/Globe.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ void Globe::drawDetail()
13471347
// Draw bases names
13481348
for (std::vector<Base*>::iterator j = _game->getSavedGame()->getBases()->begin(); j != _game->getSavedGame()->getBases()->end(); ++j)
13491349
{
1350-
if (pointBack((*j)->getLongitude(), (*j)->getLatitude()))
1350+
if ((*j)->getMarker() == -1 || pointBack((*j)->getLongitude(), (*j)->getLatitude()))
13511351
continue;
13521352
polarToCart((*j)->getLongitude(), (*j)->getLatitude(), &x, &y);
13531353
label->setX(x - 40);

‎src/Ruleset/RuleGlobe.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ void RuleGlobe::loadDat(const std::string &filename)
154154
for (int i = 0, j = 0; i < points; ++i)
155155
{
156156
// Correct X-Com degrees and convert to radians
157-
double lonRad = value[j++] * 0.125f * M_PI / 180;
158-
double latRad = value[j++] * 0.125f * M_PI / 180;
157+
double lonRad = value[j++] * 0.125 * M_PI / 180;
158+
double latRad = value[j++] * 0.125 * M_PI / 180;
159159

160160
poly->setLongitude(i, lonRad);
161161
poly->setLatitude(i, latRad);

‎src/Ruleset/Ruleset.cpp‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,14 +1273,23 @@ const std::vector<std::vector<int> > &Ruleset::getAlienItemLevels() const
12731273
}
12741274

12751275
/**
1276-
* Gets the Defined starting base.
1276+
* Gets the defined starting base.
12771277
* @return The starting base definition.
12781278
*/
1279-
const YAML::Node &Ruleset::getStartingBase()
1279+
const YAML::Node &Ruleset::getStartingBase() const
12801280
{
12811281
return _startingBase;
12821282
}
12831283

1284+
/**
1285+
* Gets the defined starting time.
1286+
* @return The time the game starts in.
1287+
*/
1288+
const GameTime &Ruleset::getStartingTime() const
1289+
{
1290+
return _startingTime;
1291+
}
1292+
12841293
/**
12851294
* Gets an MCDPatch.
12861295
* @param id The ID of the MCDPatch we want.

‎src/Ruleset/Ruleset.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,10 @@ class Ruleset
219219
const City *locateCity(double lon, double lat) const;
220220
/// Gets the alien item level table.
221221
const std::vector<std::vector<int> > &getAlienItemLevels() const;
222-
/// Gets the Defined starting base.
223-
const YAML::Node &getStartingBase();
222+
/// Gets the player starting base.
223+
const YAML::Node &getStartingBase() const;
224+
/// Gets the game starting time.
225+
const GameTime &getStartingTime() const;
224226
/// Gets an MCDPatch.
225227
MCDPatch *getMCDPatch(const std::string name) const;
226228
/// Gets the list of external Sprites.

0 commit comments

Comments
 (0)