Merge branch 'master' of https://github.com/MajorTom6/natures

Conflicts:
	src/list.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/inc/creature.hpp b/inc/creature.hpp
index a0046fb..9a26ee8 100644
--- a/inc/creature.hpp
+++ b/inc/creature.hpp
@@ -12,14 +12,14 @@ class Creature: public Entity
 	  void Action();
     void Priority();
     Location getLocation();
-    void giveKnown(std::vector<Location> Z){K=Z;};
+    void giveKnown(std::vector<Location> Z){location = Z;};
 
   private:
-    int xT;
-    int yT;
-    int hp;
-    int hu;
-    std::vector<Location> K;
+    int xTarget; //x-coordinate of creature's target position
+    int yTarget; //y-coordinate of creature's target position
+    int health; //health of a creature (0-100)
+    int hunger; //value associated with a creatures want to find food (0-100)
+    std::vector<Location> location; //vector containing creatures location on window or target location?
 };
 
 #endif