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

Conflicts:
	src/list.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/inc/location.hpp b/inc/location.hpp
index 6a20b4e..8bd512c 100644
--- a/inc/location.hpp
+++ b/inc/location.hpp
@@ -4,12 +4,12 @@
 class Location
 {
   public:
-    Location(){x=y=t=0;};
-	  Location(int x1, int y1, int t1){x=x1;y=y1;t=t1;};
+    Location(){x=y=type=0;}; //is this line needed?
+	  Location(int x1, int y1, int t1){x=x1;y=y1;type=t1;};
 
-    int x;
-	  int y;
-	  int t;
+    int x; //x-coordinate of entity
+	  int y; //y-coordinate of entity
+	  int type; //value associated with type of entity at location. 1: Creature, 2: Resource
 };
 
 #endif