X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgamedef.h;h=6cd01305f2638da9597d73d37f76c3496c32a19a;hb=182bd6ab45145b8a52e91d98511c7c1cd0c8f7f7;hp=793d85b39df07eb0c57d807d319f295ab00bb0ee;hpb=b1965ac20922e3722392114bd63a22b403dcbe98;p=dragonfireclient.git

diff --git a/src/gamedef.h b/src/gamedef.h
index 793d85b39..6cd01305f 100644
--- a/src/gamedef.h
+++ b/src/gamedef.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GAMEDEF_HEADER
 
 #include <string>
+#include <vector>
 #include "irrlichttypes.h"
 
 class IItemDefManager;
@@ -31,11 +32,16 @@ class ISoundManager;
 class IShaderSource;
 class MtEventManager;
 class IRollbackManager;
+class EmergeManager;
+class Camera;
+class ModMetadata;
+
 namespace irr { namespace scene {
 	class IAnimatedMesh;
 	class ISceneManager;
 }}
 
+struct ModSpec;
 /*
 	An interface for fetching game-global definitions like tool and
 	mapnode properties
@@ -50,39 +56,29 @@ class IGameDef
 	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; }
-	virtual scene::ISceneManager* getSceneManager()=0;
 
 	// Only usable on the server, and NOT thread-safe. It is usable from the
 	// environment thread.
-	virtual IRollbackManager* getRollbackManager(){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();}
-	IRollbackManager* rollback(){return getRollbackManager();}
+	IItemDefManager  *idef()     { return getItemDefManager(); }
+	INodeDefManager  *ndef()     { return getNodeDefManager(); }
+	ICraftDefManager *cdef()     { return getCraftDefManager(); }
+
+	MtEventManager   *event()    { return getEventManager(); }
+	IRollbackManager *rollback() { return getRollbackManager(); }
+
+	virtual const std::vector<ModSpec> &getMods() const = 0;
+	virtual const ModSpec* getModSpec(const std::string &modname) const = 0;
+	virtual std::string getWorldPath() const { return ""; }
+	virtual std::string getModStoragePath() const = 0;
+	virtual bool registerModStorage(ModMetadata *storage) = 0;
+	virtual void unregisterModStorage(const std::string &name) = 0;
 };
 
 #endif