summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authortom <tom@ground-control>2016-05-02 18:23:19 -0500
committertom <tom@ground-control>2016-05-02 18:23:19 -0500
commit0346965968fb5da1a52ed8f896a922c63ce180f6 (patch)
tree917da10ed0e0e86a76abe4f3634cb6cf5b8a4fc6 /inc
parent4bb5b05443c36bc6e0a164bc7e324a5486be45ff (diff)
done refractoring type
Diffstat (limited to 'inc')
-rw-r--r--inc/entity.hpp1
-rw-r--r--inc/location.hpp7
2 files changed, 4 insertions, 4 deletions
diff --git a/inc/entity.hpp b/inc/entity.hpp
index ee42858..0f35e86 100644
--- a/inc/entity.hpp
+++ b/inc/entity.hpp
@@ -9,6 +9,7 @@ class Entity
public:
void Place();
SDL_Texture* loadTexture(std::string path, Window main);
+ int getType(){return type;};
protected:
Location L;
diff --git a/inc/location.hpp b/inc/location.hpp
index 0e3ee23..5392e9b 100644
--- a/inc/location.hpp
+++ b/inc/location.hpp
@@ -4,11 +4,10 @@
class Location
{
public:
- Location(int x1, int y1, int t1){x=x1;y=y1;type=t1;};
- Location(){x=y=type=0;};
+ Location(int x1, int y1){x=x1;y=y1;};
+ Location(){x=y=0;};
int x;
- int y;
- int type; //value associated with type of entity at location. 1: Creature, 2: Resource
+ int y;
};
#endif