diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-11 07:38:33 -0500 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-11 07:38:33 -0500 |
commit | 6bf27552a564297cd8aaf1e3c24d9320438bdcc5 (patch) | |
tree | 1947c5911d234e72cbf189433612047c443e40e6 /include/world.h | |
parent | c16827da9b66f42e2bd0d002381bdcdaa2ac8045 (diff) | |
parent | a2284d1c9be35744cb43a91148c82cff64be7a43 (diff) |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/world.h')
-rw-r--r-- | include/world.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/world.h b/include/world.h index 5021fbb..0e85462 100644 --- a/include/world.h +++ b/include/world.h @@ -167,7 +167,7 @@ public: * loaded inside the world, with the Entity vector containing pointers to * the contents of all the others. */ - + std::vector<NPC *> npc; std::vector<Structures *> build; std::vector<Mob *> mob; |