diff options
| author | Kahrl <kahrl@gmx.net> | 2017-09-11 15:51:40 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2017-09-12 19:31:46 +0200 |
| commit | 17fd5fe9358615633a04d7a3941b444a8ce5f199 (patch) | |
| tree | fc2862413a9fb3b022ae773498ef7d6d5c588eac /src/nodedef.h | |
| parent | 5b3fbf9cf75f9f637c666d34e2489fef0cc035d9 (diff) | |
| download | minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.tar.gz minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.tar.bz2 minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.zip | |
Make INodeDefManager::getIds return a vector, not a set
Diffstat (limited to 'src/nodedef.h')
| -rw-r--r-- | src/nodedef.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nodedef.h b/src/nodedef.h index 853b9bddd..23100a2ed 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <string> #include <iostream> #include <map> -#include <list> #include "mapnode.h" #ifndef SERVER #include "client/tile.h" @@ -42,8 +41,6 @@ class IShaderSource; class IGameDef; class NodeResolver; -typedef std::list<std::pair<content_t, int> > GroupItems; - enum ContentParamType { CPT_NONE, @@ -290,7 +287,7 @@ struct ContentFeatures // for NDT_CONNECTED pairing u8 connect_sides; std::vector<std::string> connects_to; - std::set<content_t> connects_to_ids; + std::vector<content_t> connects_to_ids; // Post effect color, drawn when the camera is inside the node. video::SColor post_effect_color; // Flowing liquid or snow, value = default level @@ -424,7 +421,7 @@ public: virtual content_t getId(const std::string &name) const=0; // Allows "group:name" in addition to regular node names // returns false if node name not found, true otherwise - virtual bool getIds(const std::string &name, std::set<content_t> &result) + virtual bool getIds(const std::string &name, std::vector<content_t> &result) const=0; virtual const ContentFeatures &get(const std::string &name) const=0; @@ -452,7 +449,7 @@ public: // If not found, returns CONTENT_IGNORE virtual content_t getId(const std::string &name) const=0; // Allows "group:name" in addition to regular node names - virtual bool getIds(const std::string &name, std::set<content_t> &result) + virtual bool getIds(const std::string &name, std::vector<content_t> &result) const=0; // If not found, returns the features of CONTENT_UNKNOWN virtual const ContentFeatures &get(const std::string &name) const=0; |