diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-20 08:58:44 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-20 08:58:44 -0500 |
commit | 19ef54b2c5ffcaefdce352c6f195a62c05c42767 (patch) | |
tree | 2c8dbf3aea3539d2f4c6db3ef56eb1880fd14786 /include/entities.h | |
parent | 6be7b11513cdedc17358da314c6e5a5630be00c1 (diff) | |
parent | cc4cd76409894615887e0b39d7db5b722138a613 (diff) |
inv/background merge
Diffstat (limited to 'include/entities.h')
-rw-r--r-- | include/entities.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/entities.h b/include/entities.h index c2de1b1..403c3c5 100644 --- a/include/entities.h +++ b/include/entities.h @@ -113,9 +113,12 @@ public: class Object : public Entity{ public: Object(int); + Object(int, bool, char*); void interact(); + bool questObject = false; + char *pickupDialog; private: - int ID; + int identifier; }; #endif // ENTITIES_H |