From 72eaaeb60916e736de6c1aaa3d1047663bce19d9 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin.worthe@gmail.com>
Date: Mon, 8 Jun 2015 21:21:08 +0200
Subject: Started adding test for reading game state

---
 include/game_state.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/game_state.h b/include/game_state.h
index 1b35fc6..7ccef54 100644
--- a/include/game_state.h
+++ b/include/game_state.h
@@ -7,18 +7,22 @@
 #include "spaceship.h"
 #include <vector>
 #include <string>
+#include <istream>
 
 class GameState
 {
 public:
-    GameState(std::string mapFilename);
+    GameState(std::istream &&mapFile);
     void logState();
+
+    const std::vector<Alien>& aliens() const { return _aliens; }
+    
 private:
-    std::vector<Alien> aliens;
-    std::vector<EnemyBullet> bullets;
-    std::vector<PlayerMissile> missiles;
-    std::vector<Shield> shields;
-    std::vector<Spaceship> spaceships;
+    std::vector<Alien> _aliens;
+    std::vector<EnemyBullet> _bullets;
+    std::vector<PlayerMissile> _missiles;
+    std::vector<Shield> _shields;
+    std::vector<Spaceship> _spaceships;
 
     int addEntity(int x, int y, char type);
 };
-- 
cgit v1.2.3