diff options
| author | tom <tom@ground-control> | 2015-05-08 08:07:11 -0500 |
|---|---|---|
| committer | tom <tom@ground-control> | 2015-05-08 08:07:11 -0500 |
| commit | dddcaa7e5fa044972e25e456315c5cba361fc0f5 (patch) | |
| tree | 299180915292000b2d5029888eb75178b81e8053 /inc/entity.hpp | |
| parent | 84f94931fa790572b3ce57d72e290f0bd860c661 (diff) | |
| parent | c63d77ddddb69ef0f641d90a8c3922fdc356224c (diff) | |
Merge branch 'master' of https://github.com/MajorTom6/natures
Conflicts:
src/list.cpp
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; |