luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-16 01:45:36 +02:00
Code Activity

Make INodeDefManager::getIds return a vector, not a set

Browse Source
This commit is contained in:
Kahrl
2017-09-11 15:51:40 +02:00
committed by sfan5
parent 5b3fbf9cf7
commit 17fd5fe935
7 changed files with 64 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nodedef.h
View File

@@ -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;