Convert Base Vehicles

not 100% sure this works as it should, but it should work.

Author: Warboy1982

src/Battlescape/BattlescapeGenerator.cpp

@@ -257,7 +257,6 @@ void BattlescapeGenerator::run()
 
 		// add vehicles that are in the craft - a vehicle is actually an item, which you will never see as it is converted to a unit
 		// however the item itself becomes the weapon it "holds".
-		// TODO: Convert base vehicles
 		if (_craft != 0)
 		{
 			for (std::vector<Vehicle*>::iterator i = _craft->getVehicles()->begin(); i != _craft->getVehicles()->end(); ++i)
@@ -274,6 +273,22 @@ void BattlescapeGenerator::run()
 				unit->setTurretType((*i)->getRules()->getTurretType());
 			}
 		}
+		else if (_base != 0)
+		{
+			for (std::vector<Vehicle*>::iterator i = _base->getVehicles()->begin(); i != _base->getVehicles()->end(); ++i)
+			{
+				std::string vehicle = (*i)->getRules()->getType();
+				Unit *rule = _game->getRuleset()->getUnit(vehicle.substr(4));
+				unit = addXCOMUnit(new BattleUnit(rule, FACTION_PLAYER, _unitSequence++, _game->getRuleset()->getArmor(rule->getArmor())));
+				addItem(_game->getRuleset()->getItem(vehicle), unit);
+				if((*i)->getRules()->getClipSize() != -1)
+				{
+					std::string ammo = (*i)->getRules()->getCompatibleAmmo()->front();
+					addItem(_game->getRuleset()->getItem(ammo), unit)->setAmmoQuantity((*i)->getAmmo());
+				}
+				unit->setTurretType((*i)->getRules()->getTurretType());
+			}
+		}
 
 		// add soldiers that are in the craft or base
 		for (std::vector<Soldier*>::iterator i = _base->getSoldiers()->begin(); i != _base->getSoldiers()->end(); ++i)

src/Savegame/Base.cpp

@@ -1131,4 +1131,27 @@ std::vector<BaseFacility*> *Base::getDefenses()
 	}
 	return total;
 }
+
+/**
+ * Returns the list of vehicles currently equipped
+ * in the base.
+ * @return Pointer to vehicle list.
+ */
+std::vector<Vehicle*> *Base::getVehicles()
+{
+	for (std::vector<Vehicle*>::iterator v = _vehicles.begin(); v < _vehicles.end(); ++v)
+	{
+		delete (*v);
+	}
+	for (std::map<std::string, int>::iterator i = _items->getContents()->begin(); i != _items->getContents()->end(); ++i)
+	{
+		if (_rule->getItem((i)->first)->isFixed())
+		{
+			std::string type = _rule->getItem((i)->first)->getType();
+			Vehicle *v = new Vehicle(_rule->getItem((i)->first), 0);
+			_vehicles.push_back(v);
+		}
+	}
+	return &_vehicles;
+}
 }

src/Savegame/Base.h

@@ -38,6 +38,7 @@ class Ruleset;
 class SavedGame;
 class ResearchProject;
 class Production;
+class Vehicle;
 
 /**
  * Represents a player base on the globe.
@@ -58,6 +59,7 @@ class Base : public Target
 	std::vector<Production *> _productions;
 	bool _inBattlescape;
 	bool _retaliationTarget;
+	std::vector<Vehicle*> _vehicles;
 public:
 	/// Creates a new base.
 	Base(const Ruleset *rule);
@@ -187,6 +189,8 @@ class Base : public Target
 	int getGravShields() const;
 	/// Get a list of Defensive Facilities
 	std::vector<BaseFacility*> *getDefenses();
+	/// Gets the base's vehicles.
+	std::vector<Vehicle*> *getVehicles();
 };
 
 }