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/entity.hpp | |
parent | 76e10e651906b756c4482274cdf1d8ccb686b915 (diff) | |
parent | 8c5121486a0e5d94ae5e5ee67370a31530cf8b6f (diff) |
Merge branch 'master' of http://github.com/majortom6/natures
Diffstat (limited to 'inc/entity.hpp')
-rw-r--r-- | inc/entity.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/entity.hpp b/inc/entity.hpp index 5ed2e74..079da9b 100644 --- a/inc/entity.hpp +++ b/inc/entity.hpp @@ -10,8 +10,8 @@ class Entity SDL_Texture* loadTexture(std::string path, Window main); protected: - int x, y; - int height, width; + int xPosition, yPosition; //Coordinates of entity on window + int height, width; //Dimensions of image on window int degrees = 0; SDL_Texture* texture; SDL_Renderer* renderer; |