1 files changed, 13 insertions, 3 deletions
diff --git a/include/game_state.h b/include/game_state.h
index 482dd7d..c129d28 100644
--- a/include/game_state.h
+++ b/include/game_state.h
@@ -5,21 +5,27 @@
 #include "player_missile.h"
 #include "shield.h"
 #include "spaceship.h"
+#include "building.h"
 #include <vector>
 #include <string>
 #include <istream>
+#include <memory>
 
 class GameState
 {
 public:
     GameState(std::istream &&mapFile);
-    void logState();
+    void logState() const;
 
     const std::vector<Alien>& aliens() const { return _aliens; }
     const std::vector<EnemyBullet>& bullets() const { return _bullets; }
     const std::vector<PlayerMissile>& missiles() const { return _missiles; }
     const std::vector<Shield>& shields() const { return _shields; }
-    const std::vector<Spaceship>& spaceships() const { return _spaceships; }
+    const std::vector<Building>& missileControllers() const { return _missileControllers; }
+    const std::vector<Building>& alienFactories() const { return _alienFactories; }
+    
+    const std::unique_ptr<Spaceship>& playerSpaceship() const { return _playerSpaceship; }
+    const std::unique_ptr<Spaceship>& enemySpaceship() const { return _enemySpaceship; }
 
     std::vector<bool> toBitArray() const;
     
@@ -28,7 +34,11 @@ private:
     std::vector<EnemyBullet> _bullets;
     std::vector<PlayerMissile> _missiles;
     std::vector<Shield> _shields;
-    std::vector<Spaceship> _spaceships;
+    std::vector<Building> _missileControllers;
+    std::vector<Building> _alienFactories;
 
+    std::unique_ptr<Spaceship> _playerSpaceship;
+    std::unique_ptr<Spaceship> _enemySpaceship;
+    
     int addEntity(int x, int y, char type);
 };