diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
commit | 81cf23371b94baf608c98d0dd248acfbbd5d2c70 (patch) | |
tree | 42282b56ce04e17fcc3f61d6b356b6ac72250915 /include/entities.h | |
parent | cdd792bc8ba7337e7bd3a9d0b4141c63f17fb9a8 (diff) | |
parent | e043a2432c4dacce56a308948188482fb230ff33 (diff) |
merge
Diffstat (limited to 'include/entities.h')
-rw-r--r-- | include/entities.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/entities.h b/include/entities.h index 0f7ac9b..0fcc662 100644 --- a/include/entities.h +++ b/include/entities.h @@ -152,6 +152,7 @@ public: GENDER gender; Texturec *tex; + Texturec *ntex; unsigned int randDialog; @@ -169,7 +170,7 @@ public: void baseLoad(char *); }; -class Player : public Entity { +class Player : public Entity{ public: QuestHandler qh; bool light = false; |