diff options
| -rw-r--r-- | include/entities.h | 3 | ||||
| -rw-r--r-- | src/entities.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/entities.h b/include/entities.h index a2ecfac..eeb58e4 100644 --- a/include/entities.h +++ b/include/entities.h @@ -59,9 +59,8 @@ public: }; class NPC : public Entity{ -private: - std::vector<int (*)(NPC *)>aiFunc; public: + std::vector<int (*)(NPC *)>aiFunc; NPC(); void addAIFunc(int (*func)(NPC *)); void interact(); diff --git a/src/entities.cpp b/src/entities.cpp index 64c8cb7..bd0cc67 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -33,8 +33,7 @@ void Entity::draw(void){ //draws the entities glTexCoord2i(1,1);glVertex2i(loc.x + width, loc.y); glTexCoord2i(1,0);glVertex2i(loc.x + width, loc.y + height); glTexCoord2i(0,0);glVertex2i(loc.x, loc.y + height); - } - else if(gender == FEMALE){ + }else if(gender == FEMALE){ glColor3ub(255,105,180); glTexCoord2i(0,1);glVertex2i(loc.x, loc.y); glTexCoord2i(1,1);glVertex2i(loc.x + width, loc.y); |