diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-03-16 08:41:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 08:41:33 +0100 |
| commit | 6c184947c3886ce80aa9eb9807a700025a344442 (patch) | |
| tree | a9c9cebb4b9ff2206f93ff02c00c4a801e6fa760 /src/server.h | |
| parent | 5e61f64ce259fe0b23cbb377b44e90a0fbc820d7 (diff) | |
| download | minetest-6c184947c3886ce80aa9eb9807a700025a344442.tar.gz minetest-6c184947c3886ce80aa9eb9807a700025a344442.tar.bz2 minetest-6c184947c3886ce80aa9eb9807a700025a344442.zip | |
Server: delegate mod management & config to ServerModConfiguration (#7131)
* Server: delegate mod management & config to ServerModConfiguration (rename it to ServerModManager)
* Use c++11 range based loops
* Add unittests + experimental/default mod as a test case to permit testing mod loading in future tests
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.h b/src/server.h index b90971200..847642be9 100644 --- a/src/server.h +++ b/src/server.h @@ -61,6 +61,7 @@ class ServerEnvironment; struct SimpleSoundSpec; struct CloudParams; class ServerThread; +class ServerModManager; enum ClientDeletionReason { CDR_LEAVE, @@ -268,7 +269,7 @@ public: NodeDefManager* getWritableNodeDefManager(); IWritableCraftDefManager* getWritableCraftDefManager(); - virtual const std::vector<ModSpec> &getMods() const { return m_mods; } + virtual const std::vector<ModSpec> &getMods() const; virtual const ModSpec* getModSpec(const std::string &modname) const; void getModNames(std::vector<std::string> &modlist); std::string getBuiltinLuaPath(); @@ -541,6 +542,7 @@ private: EventManager *m_event; // Mods + std::unique_ptr<ServerModManager> m_modmgr; std::vector<ModSpec> m_mods; /* |