Landscape.cpp   Landscape.cpp 
skipping to change at line 98 skipping to change at line 98
location.name = landscapeIni.value("location/name").toString (); location.name = landscapeIni.value("location/name").toString ();
else else
location.name = name; location.name = name;
location.landscapeKey = name; location.landscapeKey = name;
// New entries by GZ. // New entries by GZ.
if (landscapeIni.contains("location/light_pollution")) if (landscapeIni.contains("location/light_pollution"))
defaultBortleIndex = landscapeIni.value("location/light_poll ution").toInt(); defaultBortleIndex = landscapeIni.value("location/light_poll ution").toInt();
else defaultBortleIndex=-1; // mark "invalid/no change". else defaultBortleIndex=-1; // mark "invalid/no change".
if (defaultBortleIndex<=0) defaultBortleIndex=-1; // also allow neg. values in ini file, signalling "no change". if (defaultBortleIndex<=0) defaultBortleIndex=-1; // also allow neg. values in ini file, signalling "no change".
if (defaultBortleIndex>9) defaultBortleIndex=9; // correct bad value s. if (defaultBortleIndex>9) defaultBortleIndex=9; // correct bad value s.
if (landscapeIni.contains("location/display_fog"))
defaultFogSetting = landscapeIni.value("location/display_fog defaultFogSetting = landscapeIni.value("location/display_fog", -1).t
").toInt(); oInt();
else defaultFogSetting=-1; defaultExtinctionCoefficient = landscapeIni.value("location/atmosphe
if (landscapeIni.contains("location/atmospheric_extinction_coefficie ric_extinction_coefficient", -1.0).toDouble();
nt")) defaultTemperature = landscapeIni.value("location/atmospheric_temper
defaultExtinctionCoefficient = landscapeIni.value("location/ ature", -1000.0).toDouble();
atmospheric_extinction_coefficient").toDouble(); defaultPressure = landscapeIni.value("location/atmospheric_pressure"
else defaultExtinctionCoefficient=-1.0; , -2.0).toDouble();
if (landscapeIni.contains("location/atmospheric_temperature")) // Set night brightness for landscape
defaultTemperature = landscapeIni.value("location/atmospheri defaultBrightness = landscapeIni.value("landscape/initial_brightness
c_temperature").toDouble(); ", -1.0).toDouble();
else defaultTemperature=-1000.0;
if (landscapeIni.contains("location/atmospheric_pressure"))
defaultPressure = landscapeIni.value("location/atmospheric_p
ressure").toDouble();
else defaultPressure=-2.0; // "no change"
} }
#include <iostream> #include <iostream>
const QString Landscape::getTexturePath(const QString& basename, const QStr ing& landscapeId) const QString Landscape::getTexturePath(const QString& basename, const QStr ing& landscapeId)
{ {
// look in the landscape directory first, and if not found default t o global textures directory // look in the landscape directory first, and if not found default t o global textures directory
QString path; QString path;
try try
{ {
path = StelFileMgr::findFile("landscapes/" + landscapeId + " /" + basename); path = StelFileMgr::findFile("landscapes/" + landscapeId + " /" + basename);
 End of changes. 1 change blocks. 
17 lines changed or deleted 12 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/