diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:34:00 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:34:00 -0500 |
| commit | 5c1be9978e4c9b18c400c051fc2b083a02b74b7a (patch) | |
| tree | 2c8dbf3aea3539d2f4c6db3ef56eb1880fd14786 /include/entities.h | |
| parent | 4bf3665158e71e9b20a2231428d42d400da8332f (diff) | |
| parent | 19ef54b2c5ffcaefdce352c6f195a62c05c42767 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
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 |