StelObserver.cpp   StelObserver.cpp 
skipping to change at line 262 skipping to change at line 262
void SpaceShipObserver::update(double deltaTime) void SpaceShipObserver::update(double deltaTime)
{ {
timeToGo -= deltaTime; timeToGo -= deltaTime;
// If move is over // If move is over
if (timeToGo <= 0.) if (timeToGo <= 0.)
{ {
timeToGo = 0.; timeToGo = 0.;
currentLocation = moveTargetLocation; currentLocation = moveTargetLocation;
LandscapeMgr* ls = GETSTELMODULE(LandscapeMgr); LandscapeMgr* ls = GETSTELMODULE(LandscapeMgr);
SolarSystem* ss = GETSTELMODULE(SolarSystem);
if (ls->getFlagLandscapeAutoSelection()) if (ls->getFlagLandscapeAutoSelection())
{ {
// If we have a landscape for target planet then set QString pType = ss->getPlanetType(currentLocation.pl
it, otherwise use default landscape anetName);
// If we have a landscape for target planet then set
it or check and use
// landscape type of target planet, otherwise use de
fault landscape
if (ls->getAllLandscapeNames().indexOf(currentLocati on.planetName)>0) if (ls->getAllLandscapeNames().indexOf(currentLocati on.planetName)>0)
ls->setCurrentLandscapeName(currentLocation. planetName); ls->setCurrentLandscapeName(currentLocation. planetName);
else if (ls->getAllLandscapeIDs().indexOf(pType)>0)
ls->setCurrentLandscapeID(pType);
else else
ls->setCurrentLandscapeID(ls->getDefaultLand scapeID()); ls->setCurrentLandscapeID(ls->getDefaultLand scapeID());
} }
} }
else else
{ {
if (artificialPlanet) if (artificialPlanet)
{ {
// Update SpaceShip position // Update SpaceShip position
static_cast<ArtificialPlanet*>(artificialPlanet.data ())->computeAverage(timeToGo/(timeToGo + deltaTime)); static_cast<ArtificialPlanet*>(artificialPlanet.data ())->computeAverage(timeToGo/(timeToGo + deltaTime));
 End of changes. 3 change blocks. 
2 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/