summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/entity.hpp5
-rw-r--r--inc/location.hpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/inc/entity.hpp b/inc/entity.hpp
index 803c1e4..3555c62 100644
--- a/inc/entity.hpp
+++ b/inc/entity.hpp
@@ -11,9 +11,8 @@ class Entity
SDL_Texture* loadTexture(std::string path, Window main);
protected:
- //Location L;
- int xPosition, yPosition; //Coordinates of entity on window
- int height, width; //Dimensions of image on window
+ Location L;
+ int height, width; //Dimensions of image on window
int degrees = 0;
SDL_Texture* texture;
SDL_Renderer* renderer;
diff --git a/inc/location.hpp b/inc/location.hpp
index 9f50863..0e3ee23 100644
--- a/inc/location.hpp
+++ b/inc/location.hpp
@@ -5,8 +5,9 @@ class Location
{
public:
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
+ Location(){x=y=type=0;};
+ int x;
+ int y;
int type; //value associated with type of entity at location. 1: Creature, 2: Resource
};