diff options
| author | tom <tom@ground-control> | 2016-05-02 18:15:26 -0500 |
|---|---|---|
| committer | tom <tom@ground-control> | 2016-05-02 18:15:26 -0500 |
| commit | 4bb5b05443c36bc6e0a164bc7e324a5486be45ff (patch) | |
| tree | 460cad1b8dac8d0af64b936f02447a832fbc625a /inc | |
| parent | b5b0644cf5ca8f5a35c023a1b87a3e28ff33fc51 (diff) | |
commiting before refractoring type out of location and into entity
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/creature.hpp | 4 | ||||
| -rw-r--r-- | inc/entity.hpp | 3 | ||||
| -rw-r--r-- | inc/resource.hpp | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/inc/creature.hpp b/inc/creature.hpp index f3bd723..ffff888 100644 --- a/inc/creature.hpp +++ b/inc/creature.hpp @@ -31,12 +31,14 @@ class Creature: public Entity int health; int maxHealth; int hunger; - int speed = 2; + int speed = 1; bool able; int bestSense = 100; vector<Resource*> nR; //vector containing resources near the creature vector<Creature*> nC; //vector containing creatures near the creature + vector<Entity*> N; + int n; }; diff --git a/inc/entity.hpp b/inc/entity.hpp index 3555c62..ee42858 100644 --- a/inc/entity.hpp +++ b/inc/entity.hpp @@ -14,7 +14,8 @@ class Entity Location L; int height, width; //Dimensions of image on window int degrees = 0; - SDL_Texture* texture; + int type = 0; + SDL_Texture* texture; SDL_Renderer* renderer; }; diff --git a/inc/resource.hpp b/inc/resource.hpp index 5c45f96..968c208 100644 --- a/inc/resource.hpp +++ b/inc/resource.hpp @@ -9,8 +9,9 @@ class Resource: public Entity public: Resource(Window m, std::string s); Resource(Window m, std::string s, Location z); - Location getLocation(); void eat(); + + Location getLocation(){return L;}; int getAmount(){return amount;}; private: |