Merge remote-tracking branch 'upstream/master' into dual_boot

Author: myk002

src/Geoscape/GeoscapeState.cpp

@@ -822,6 +822,13 @@ void GeoscapeState::time5Seconds()
 			}
 			if ((*j)->reachedDestination())
 			{
+				if ((*j)->getDestination()->getSiteDepth() > (*j)->getRules()->getMaxDepth())
+				{
+					std::wstring msg = tr("STR_SITE_TOO_DEEP").arg((*j)->getName(_game->getLanguage()));
+					(*j)->returnToBase();
+					popup(new CraftErrorState(this, msg));
+					continue;
+				}
 				Ufo* u = dynamic_cast<Ufo*>((*j)->getDestination());
 				Waypoint *w = dynamic_cast<Waypoint*>((*j)->getDestination());
 				MissionSite* m = dynamic_cast<MissionSite*>((*j)->getDestination());

src/Ruleset/AlienDeployment.cpp

@@ -108,7 +108,7 @@ namespace OpenXcom
  * type of deployment data.
  * @param type String defining the type.
  */
-AlienDeployment::AlienDeployment(const std::string &type) : _type(type), _width(0), _length(0), _height(0), _civilians(0), _shade(-1), _noRetreat(false), _finalDestination(false), _finalMission(false), _markerIcon(-1), _durationMin(0), _durationMax(0), _minDepth(0), _maxDepth(0)
+AlienDeployment::AlienDeployment(const std::string &type) : _type(type), _width(0), _length(0), _height(0), _civilians(0), _shade(-1), _noRetreat(false), _finalDestination(false), _finalMission(false), _markerIcon(-1), _durationMin(0), _durationMax(0), _minDepth(0), _maxDepth(0), _minSiteDepth(0), _maxSiteDepth(0)
 {
 }
 
@@ -148,6 +148,11 @@ void AlienDeployment::load(const YAML::Node &node)
 		_minDepth = node["depth"][0].as<int>(_minDepth);
 		_maxDepth = node["depth"][1].as<int>(_maxDepth);
 	}
+	if (node["siteDepth"])
+	{
+		_minSiteDepth = node["siteDepth"][0].as<int>(_minSiteDepth);
+		_maxSiteDepth = node["siteDepth"][1].as<int>(_maxSiteDepth);
+	}
 	if (node["duration"])
 	{
 		_durationMin = node["duration"][0].as<int>(_durationMin);
@@ -353,4 +358,22 @@ int AlienDeployment::getMaxDepth()
 	return _maxDepth;
 }
 
+/**
+ * Gets The minimum depth for this deployment's mission site.
+ * @return The minimum depth.
+ */
+int AlienDeployment::getMinSiteDepth()
+{
+	return _minSiteDepth;
+}
+
+/**
+ * Gets The maximum depth for this deployment's mission site.
+ * @return The maximum depth.
+ */
+int AlienDeployment::getMaxSiteDepth()
+{
+	return _maxSiteDepth;
+}
+
 }

src/Ruleset/AlienDeployment.h

@@ -71,7 +71,7 @@ class AlienDeployment
 	std::string _alert;
 	BriefingData _briefingData;
 	std::string _markerName;
-	int _markerIcon, _durationMin, _durationMax, _minDepth, _maxDepth;
+	int _markerIcon, _durationMin, _durationMax, _minDepth, _maxDepth, _minSiteDepth, _maxSiteDepth;
 public:
 	/// Creates a blank Alien Deployment ruleset.
 	AlienDeployment(const std::string &type);
@@ -121,6 +121,10 @@ class AlienDeployment
 	int getMinDepth();
 	/// Gets the maximum depth.
 	int getMaxDepth();
+	/// Gets the minimum site depth.
+	int getMinSiteDepth();
+	/// Gets the maximum site depth.
+	int getMaxSiteDepth();
 };
 
 }

src/Ruleset/RuleCraft.cpp

@@ -27,7 +27,7 @@ namespace OpenXcom
  * type of craft.
  * @param type String defining the type.
  */
-RuleCraft::RuleCraft(const std::string &type) : _type(type), _sprite(-1), _marker(-1), _fuelMax(0), _damageMax(0), _speedMax(0), _accel(0), _weapons(0), _soldiers(0), _vehicles(0), _costBuy(0), _costRent(0), _costSell(0), _repairRate(1), _refuelRate(1), _radarRange(672), _sightRange(1696), _transferTime(0), _score(0), _battlescapeTerrainData(0), _spacecraft(false), _listOrder(0), _maxItems(0)
+RuleCraft::RuleCraft(const std::string &type) : _type(type), _sprite(-1), _marker(-1), _fuelMax(0), _damageMax(0), _speedMax(0), _accel(0), _weapons(0), _soldiers(0), _vehicles(0), _costBuy(0), _costRent(0), _costSell(0), _repairRate(1), _refuelRate(1), _radarRange(672), _sightRange(1696), _transferTime(0), _score(0), _battlescapeTerrainData(0), _spacecraft(false), _listOrder(0), _maxItems(0), _maxDepth(0)
 {
 
 }
@@ -93,6 +93,7 @@ void RuleCraft::load(const YAML::Node &node, Ruleset *ruleset, int modIndex, int
 	{
 		_listOrder = listOrder;
 	}
+	_maxDepth = node["maxDepth"].as<int>(_maxDepth);
 	_maxItems = node["maxItems"].as<int>(_maxItems);
 }
 
@@ -348,5 +349,15 @@ int RuleCraft::getMaxItems() const
 	return _maxItems;
 }
 
+/**
+ * Gets the maximum depth this craft can dive to.
+ * @return max depth.
+ */
+int RuleCraft::getMaxDepth() const
+{
+	return _maxDepth;
+}
+
+
 }
 

src/Ruleset/RuleCraft.h

@@ -46,7 +46,7 @@ class RuleCraft
 	int _repairRate, _refuelRate, _radarRange, _sightRange, _transferTime, _score;
 	RuleTerrain *_battlescapeTerrainData;
 	bool _spacecraft;
-	int _listOrder, _maxItems;
+	int _listOrder, _maxItems, _maxDepth;
 	std::vector<std::vector <int> > _deployment;
 public:
 	/// Creates a blank craft ruleset.
@@ -107,6 +107,8 @@ class RuleCraft
 	std::vector<std::vector<int> > &getDeployment();
 	/// Gets the item limit for this craft.
 	int getMaxItems() const;
+	/// checks how deep this craft can go.
+	int getMaxDepth() const;
 };
 
 }

src/Savegame/AlienMission.cpp

@@ -703,6 +703,7 @@ MissionSite *AlienMission::spawnMissionSite(SavedGame &game, const Ruleset &rule
 		missionSite->setAlienRace(_race);
 		missionSite->setTexture(area.texture);
 		missionSite->setCity(area.name);
+		missionSite->setSiteDepth(RNG::generate(deployment->getMinSiteDepth(), deployment->getMaxSiteDepth()));
 		return missionSite;
 	}
 	return 0;

src/Savegame/Target.cpp

@@ -29,7 +29,7 @@ namespace OpenXcom
 /**
  * Initializes a target with blank coordinates.
  */
-Target::Target() : _lon(0.0), _lat(0.0)
+Target::Target() : _lon(0.0), _lat(0.0), _depth(0)
 {
 }
 
@@ -56,6 +56,7 @@ void Target::load(const YAML::Node &node)
 {
 	_lon = node["lon"].as<double>(_lon);
 	_lat = node["lat"].as<double>(_lat);
+	_depth = node["depth"].as<int>(_depth);
 }
 
 /**
@@ -67,6 +68,8 @@ YAML::Node Target::save() const
 	YAML::Node node;
 	node["lon"] = serializeDouble(_lon);
 	node["lat"] = serializeDouble(_lat);
+	if (_depth)
+		node["depth"] = _depth;
 	return node;
 }
 
@@ -156,4 +159,21 @@ double Target::getDistance(const Target *target) const
 	return acos(cos(_lat) * cos(target->getLatitude()) * cos(target->getLongitude() - _lon) + sin(_lat) * sin(target->getLatitude()));
 }
 
+/**
+ * Gets the mission site's depth.
+ * @return the depth of the site.
+ */
+int Target::getSiteDepth()
+{
+	return _depth;
+}
+
+/**
+ * Sets the mission site's depth.
+ * @param depth the depth we want.
+ */
+void Target::setSiteDepth(int depth)
+{
+	_depth = depth;
+}
 }

src/Savegame/Target.h

@@ -36,6 +36,7 @@ class Target
 {
 protected:
 	double _lon, _lat;
+	int _depth;
 	std::vector<Target*> _followers;
 	/// Creates a target.
 	Target();
@@ -64,6 +65,10 @@ class Target
 	std::vector<Target*> *getFollowers();
 	/// Gets the distance to another target.
 	double getDistance(const Target *target) const;
+	/// Gets the depth of the target.
+	int getSiteDepth();
+	/// Sets the depth of the target.
+	void setSiteDepth(int depth);
 };
 
 }