Collect atmosphere-shieldable ships only once

pioneerspacesim · Jul 5, 2012 · 36e02eb · 36e02eb
1 parent 7cdb151
commit 36e02eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/ShipFlavour.cpp b/src/ShipFlavour.cpp
@@ -64,20 +64,8 @@ void ShipFlavour::MakeTrulyRandom(ShipFlavour &v, bool atmospheric)
 {
 	// only allow ships that can fit an atmospheric shield
 	if (atmospheric) {
-		std::vector<ShipType::Type> ships;
-		for (std::vector<ShipType::Type>::const_iterator it = ShipType::player_ships.begin();
-			it != ShipType::player_ships.end(); ++it) {
-			const ShipType &ship = ShipType::types[*it];
-			if (ship.equipSlotCapacity[Equip::SLOT_ATMOSHIELD] != 0)
-				ships.push_back(*it);
-		}
-		if (!ships.empty()) {
-			v = ShipFlavour(ships[Pi::rng.Int32(ships.size())]);
-		} else {
-			// Game should have at least some matching ships...
-			assert(false);
-			v = ShipFlavour(ShipType::player_ships.front());
-		}
+		const std::vector<ShipType::Type> &ships = ShipType::playable_atmospheric_ships;
+		v = ShipFlavour(ships[Pi::rng.Int32(ships.size())]);
 	} else {
 		const std::vector<ShipType::Type> &ships = ShipType::player_ships;
 		v = ShipFlavour(ships[Pi::rng.Int32(ships.size())]);

diff --git a/src/ShipType.cpp b/src/ShipType.cpp
@@ -14,6 +14,8 @@ std::vector<ShipType::Type> ShipType::player_ships;
 std::vector<ShipType::Type> ShipType::static_ships;
 std::vector<ShipType::Type> ShipType::missile_ships;
 
+std::vector<ShipType::Type> ShipType::playable_atmospheric_ships;
+
 std::string ShipType::LADYBIRD				= "Ladybird Starfighter";
 std::string ShipType::SIRIUS_INTERDICTOR	= "Sirius Interdictor";
 std::string ShipType::EAGLE_LRF				= "Eagle Long Range Fighter";
@@ -243,5 +245,16 @@ void ShipType::Init()
 
 	if (ShipType::player_ships.empty())
 		Error("No playable ships have been defined! The game cannot run.");
+
+	//collect ships that can fit atmospheric shields
+	for (std::vector<ShipType::Type>::const_iterator it = ShipType::player_ships.begin();
+		it != ShipType::player_ships.end(); ++it) {
+		const ShipType &ship = ShipType::types[*it];
+		if (ship.equipSlotCapacity[Equip::SLOT_ATMOSHIELD] != 0)
+			ShipType::playable_atmospheric_ships.push_back(*it);
+	}
+
+	if (ShipType::playable_atmospheric_ships.empty())
+		Error("No ships can fit atmospheric shields! The game cannot run.");
 }
 
diff --git a/src/ShipType.h b/src/ShipType.h
@@ -66,6 +66,8 @@ struct ShipType {
 	static std::vector<Type> static_ships;
 	static std::vector<Type> missile_ships;
 
+	static std::vector<Type> playable_atmospheric_ships;
+
 	static const char *gunmountNames[GUNMOUNT_MAX];
 	static void Init();
 	static const ShipType *Get(const char *name) {