9 moved player definitions into source file

shm/source/Player.cpp

@@ -0,0 +1,56 @@
+#include "Player.hpp"
+#include "Ship.hpp"
+#include "Cargo.hpp"
+
+#include <numeric>
+#include <memory>
+
+Player::Player():
+	ship_(nullptr),
+	money_(0),
+	maxAvailableSpace_(100),
+	availableSpace_({0, false})
+{}
+
+size_t Player::getMoney() const { 
+	return money_; 
+}
+
+size_t Player::getAvailableSpace() { 
+	if (!availableSpace_.second) {
+		calculateAvailableSpace();
+	}
+	return availableSpace_.first;
+}
+
+size_t Player::getSpeed() const { 
+	if (ship_) {
+		return ship_->getSpeed();
+	}
+	return 0;
+}
+
+Cargo* Player::getCargo(size_t index) const {
+	if (ship_) {
+		return ship_->getCargo(index);
+	}
+	return nullptr;
+}
+
+//void Player::PayCrew(size_t money) override;
+
+//void Player::PurchaseCargo(std::unique_ptr<Cargo> cargo, size_t price);
+
+//void Player::SellCargo(Cargo* cargo, size_t price);
+
+//void Player::PrintCargo() const;
+
+void Player::calculateAvailableSpace() {
+	if (!ship_) {
+		return;
+	} 
+	const auto& allCargo = ship_->getCargo();
+	size_t count = std::accumulate(allCargo.begin(), allCargo.end(), 0, [](int sum, const auto& cargo) { return sum + cargo->getAmount(); }); 
+	availableSpace_.first = maxAvailableSpace_ - count;
+	availableSpace_.second = true;
+}

shm/source/Player.hpp

@@ -1,61 +1,35 @@
 #pragma once
+
 #include <memory>
 
-#include "Ship.hpp"
+class Ship;
+class Cargo;
 
 class Player {
-	std::unique_ptr<Ship> ship_;
-	int money_;
-	size_t availableSpace_;
+	Ship* ship_;
+	size_t money_;
+	size_t maxAvailableSpace_;
+	std::pair<size_t, bool> availableSpace_;
 
 public:
-	Player():
-		ship_(std::make_unique<Ship>()),
-		money_(0),
-		availableSpace_()
-	{}
-
-	int getMoney() const { return money_; }
-
-	size_t getAvailableSpace() const { return availableSpace_; }
-
-	size_t getSpeed() const { 
-		if (ship_) {
-			return ship_->getSpeed();
-		}
-		return 0;
-	}
-
-	Cargo* getCargo(size_t index) const {
-		if (ship_) {
-			return ship_->getCargo(index);
-		}
-		return nullptr;
-	}
-
-	std::string takeOverShip(std::unique_ptr<Ship> someoneElsesShip) { 
-		if (!someoneElsesShip) {
-			return "there is no ship";
-		}
-		if (ship_) {
-			return "already have one";
-		}
-		ship_ = std::move(someoneElsesShip);
-		return "yarr";
-	}
-
-	std::unique_ptr<Ship> giveAwayShip() { 
-		return std::move(ship_); 
-	}
-
-	int calculateAvailableSpace() const {
-		size_t index = 0;
-		size_t count = 0;
-		auto cargo = getCargo(index);		
-		while (cargo) {
-			count += cargo->getAmount();
-			cargo = getCargo(++index);
-		}
-		return static_cast<int>(getAvailableSpace() - count);
-	}
-};
+	Player();
+
+	size_t getMoney() const;
+
+	size_t getAvailableSpace();
+
+	size_t getSpeed() const;
+
+	Cargo* getCargo(size_t index) const;
+
+	// void PayCrew(size_t money) override;
+
+	//void PurchaseCargo(std::unique_ptr<Cargo> cargo, size_t price);
+
+	//void SellCargo(Cargo* cargo, size_t price);
+
+	//void PrintCargo() const;
+
+private:
+	void calculateAvailableSpace();
+};