diff --git a/shm/CMakeLists.txt b/shm/CMakeLists.txt index 1935a5b0e..630014b94 100644 --- a/shm/CMakeLists.txt +++ b/shm/CMakeLists.txt @@ -10,6 +10,7 @@ project(SHM) # set executables set(THIS_PROJECT_SRC_DIRECTORIES + source/Island.cpp source/Fortune.cpp source/Map.cpp source/Game.cpp diff --git a/shm/source/Island.cpp b/shm/source/Island.cpp new file mode 100644 index 000000000..263c402dd --- /dev/null +++ b/shm/source/Island.cpp @@ -0,0 +1,18 @@ +#include "Island.hpp" + +Island::Coordinates::Coordinates(const int x, const int y): + positionX(x), + positionY(y) +{} + +bool Island::Coordinates::operator==(const Coordinates& coordinates) { + return (positionX == coordinates.positionX && positionY == coordinates.positionY); +} + +Island::Island(const Coordinates& coordinates): + position_(coordinates) +{} + +Island::Coordinates Island::getPosition() const { + return position_; +} diff --git a/shm/source/Island.hpp b/shm/source/Island.hpp index 798cfd84f..cc95e1473 100644 --- a/shm/source/Island.hpp +++ b/shm/source/Island.hpp @@ -5,22 +5,14 @@ struct Island { int positionX; int positionY; - Coordinates(const int x, const int y): - positionX(x), - positionY(y) - {} + Coordinates(const int x, const int y); - bool operator==(const Coordinates& coordinates) { - return (positionX == coordinates.positionX && positionY == coordinates.positionY); - } + bool operator==(const Coordinates& coordinates); }; -public: - Island(const Coordinates& coordinates): - position_(coordinates) - {} + Island(const Coordinates& coordinates); - Coordinates getPosition() const { return position_; } + Coordinates getPosition() const; private: Coordinates position_;