diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-06-27 21:06:31 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-06-27 21:06:31 -0400 |
| commit | 00f633afb62ed6914205639b44dcdaf839a2c2f7 (patch) | |
| tree | 5ec98271bb09cd8f1c77c40a8699e0deaadeb942 /include | |
| parent | b202b0d3952e546aaa6d64d42886d9c926f6bd76 (diff) | |
redid trees, fixed indoors?
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.hpp | 2 | ||||
| -rw-r--r-- | include/texture.hpp | 4 | ||||
| -rw-r--r-- | include/world.hpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/entities.hpp b/include/entities.hpp index 2523364..76b6fa8 100644 --- a/include/entities.hpp +++ b/include/entities.hpp @@ -325,7 +325,7 @@ public: class Structures : public Entity { public: BUILD_SUB bsubtype; - World *inWorld; + World *inWorld, *insideWorld; std::string inside; std::string textureLoc; diff --git a/include/texture.hpp b/include/texture.hpp index 0ee3e2c..c301af1 100644 --- a/include/texture.hpp +++ b/include/texture.hpp @@ -47,9 +47,9 @@ public: position = std::begin(textures); } TextureIterator(const std::vector<std::string> &l) { - for (const auto &s : l) { + for (const auto &s : l) textures.emplace_back(Texture::loadTexture(s), s); - } + position = std::begin(textures); } void operator++(int) noexcept { diff --git a/include/world.hpp b/include/world.hpp index 34a597d..6a97daa 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -566,6 +566,7 @@ World *loadWorldFromXML(std::string path); * previous world if one was loaded. */ World *loadWorldFromXMLNoSave(std::string path); +World *loadWorldFromXMLNoTakeover(std::string path); /** * Loads a world using a pointer to the current world (used for loading adjacent |