diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-05-07 02:34:15 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-05-07 02:36:01 -0400 |
| commit | 656575b59d4f0d67452cca7409c9064f690f038c (patch) | |
| tree | 2b35b13a8b2819dadfb00799dd92ee702bd83847 /src/nodedef.h | |
| parent | d720fd564427b64cfab76e4b6177307bc46fa893 (diff) | |
| download | minetest-656575b59d4f0d67452cca7409c9064f690f038c.tar.gz minetest-656575b59d4f0d67452cca7409c9064f690f038c.tar.bz2 minetest-656575b59d4f0d67452cca7409c9064f690f038c.zip | |
NodeResolver: Remove NodeResolveMethod
This simplifies NodeResolver logic and makes some interfaces cleaner.
Diffstat (limited to 'src/nodedef.h')
| -rw-r--r-- | src/nodedef.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/nodedef.h b/src/nodedef.h index 42b345059..efd7f0923 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -282,12 +282,6 @@ struct ContentFeatures } }; -enum NodeResolveMethod { - NODE_RESOLVE_NONE, - NODE_RESOLVE_DIRECT, - NODE_RESOLVE_DEFERRED, -}; - class INodeDefManager { public: INodeDefManager(){} @@ -306,7 +300,7 @@ public: virtual bool getNodeRegistrationStatus() const=0; - virtual void pendNodeResolve(NodeResolver *nr, NodeResolveMethod how)=0; + virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; }; @@ -353,7 +347,7 @@ public: virtual bool getNodeRegistrationStatus() const=0; virtual void setNodeRegistrationStatus(bool completed)=0; - virtual void pendNodeResolve(NodeResolver *nr, NodeResolveMethod how)=0; + virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; virtual void runNodeResolveCallbacks()=0; virtual void resetNodeResolveState()=0; @@ -371,7 +365,6 @@ public: const std::string &node_alt, content_t c_fallback); bool getIdsFromNrBacklog(std::vector<content_t> *result_out, bool all_required=false, content_t c_fallback=CONTENT_IGNORE); - const std::string &getNodeName(content_t c) const; void nodeResolveInternal(); |