diff options
author | Tom Barrett <tombarrett@cornell.engr.siu.edu> | 2015-05-08 10:14:42 -0500 |
---|---|---|
committer | Tom Barrett <tombarrett@cornell.engr.siu.edu> | 2015-05-08 10:14:42 -0500 |
commit | 39d7fe95633baafe4539f604186b151f30401a39 (patch) | |
tree | 242d91eafe56a15db046a1068d8e970624c6abfd /inc/location.hpp | |
parent | 76e10e651906b756c4482274cdf1d8ccb686b915 (diff) | |
parent | 8c5121486a0e5d94ae5e5ee67370a31530cf8b6f (diff) |
Merge branch 'master' of http://github.com/majortom6/natures
Diffstat (limited to 'inc/location.hpp')
-rw-r--r-- | inc/location.hpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/inc/location.hpp b/inc/location.hpp index 2042734..8bd512c 100644 --- a/inc/location.hpp +++ b/inc/location.hpp @@ -4,14 +4,12 @@ class Location { public: - Location(){x=y=t=0;}; - Location(int x, int y, int z){}; - int getType(){return t;}; - - private: - int x; - int y; - int t; + Location(){x=y=type=0;}; //is this line needed? + Location(int x1, int y1, int t1){x=x1;y=y1;type=t1;}; + + 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 |