Revert "Plantlike: Fix visual_scale being applied squared (#5115)"

[oweals/minetest.git] / src / gamedef.h

diff --git a/src/gamedef.h b/src/gamedef.h
index 6da288bad8879992475c30592ec6045f8a6440b0..cb624bd6ac8bda7441488a7894521ddc593fd8e4 100644 (file)
--- a/src/gamedef.h
+++ b/src/gamedef.h
@@ -30,9 +30,13 @@ class ITextureSource;
 class ISoundManager;
 class IShaderSource;
 class MtEventManager;
-class IRollbackReportSink;
+class IRollbackManager;
+class EmergeManager;
+class Camera;
+
 namespace irr { namespace scene {
        class IAnimatedMesh;
+       class ISceneManager;
 }}
 
 /*
@@ -49,38 +53,22 @@ public:
        virtual INodeDefManager* getNodeDefManager()=0;
        virtual ICraftDefManager* getCraftDefManager()=0;
 
-       // This is always thread-safe, but referencing the irrlicht texture
-       // pointers in other threads than main thread will make things explode.
-       virtual ITextureSource* getTextureSource()=0;
-
-       virtual IShaderSource* getShaderSource()=0;
-       
        // Used for keeping track of names/ids of unknown nodes
        virtual u16 allocateUnknownNodeId(const std::string &name)=0;
-       
-       // Only usable on the client
-       virtual ISoundManager* getSoundManager()=0;
+
        virtual MtEventManager* getEventManager()=0;
-       virtual scene::IAnimatedMesh* getMesh(const std::string &filename)
-       { return NULL; }
 
        // Only usable on the server, and NOT thread-safe. It is usable from the
        // environment thread.
-       virtual IRollbackReportSink* getRollbackReportSink(){return NULL;}
-       
-       // Used on the client
-       virtual bool checkLocalPrivilege(const std::string &priv)
-       { return false; }
-       
+       virtual IRollbackManager* getRollbackManager() { return NULL; }
+
        // Shorthands
-       IItemDefManager* idef(){return getItemDefManager();}
-       INodeDefManager* ndef(){return getNodeDefManager();}
-       ICraftDefManager* cdef(){return getCraftDefManager();}
-       ITextureSource* tsrc(){return getTextureSource();}
-       ISoundManager* sound(){return getSoundManager();}
-       IShaderSource* shsrc(){return getShaderSource();}
-       MtEventManager* event(){return getEventManager();}
-       IRollbackReportSink* rollback(){return getRollbackReportSink();}
+       IItemDefManager  *idef()     { return getItemDefManager(); }
+       INodeDefManager  *ndef()     { return getNodeDefManager(); }
+       ICraftDefManager *cdef()     { return getCraftDefManager(); }
+
+       MtEventManager   *event()    { return getEventManager(); }
+       IRollbackManager *rollback() { return getRollbackManager();}
 };
 
 #endif