diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-25 08:49:22 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-25 08:49:22 -0400 |
| commit | 202285e89814929e551f9568b84212282b5883fe (patch) | |
| tree | 0bc89f8b7c7896af20be2371b727c63740e1b4a2 | |
| parent | b7e31e8b7ce8f470a269c6bc17e6525c6f3a4d50 (diff) | |
| parent | 53800e07513f4a625ba70ff7d805d158a6b42121 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
| -rw-r--r-- | include/entities.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/entities.hpp b/include/entities.hpp index 720141c..864c863 100644 --- a/include/entities.hpp +++ b/include/entities.hpp @@ -68,7 +68,7 @@ enum BUILD_SUB{ LAMP_POST, /**< a lamppost, creates light */ FIRE_PIT, /**< a firepit, creates fire particles / light */ STALL_MARKET = 70, /**< a stall for a merchant */ - STALL_TRADER /**< TODO */ + STALL_TRADER }; /** @@ -426,7 +426,7 @@ public: } void follow(Entity *f){ - following=f; + following = f; belongsTo = true; } }; |