diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-05-20 22:29:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 22:29:15 +0200 |
| commit | 90808a4f34dca379e872074bdfd472faf1c48cf3 (patch) | |
| tree | c98e0264a2d18f8106d6fde77c49ddb46e467dbf /src/mods.h | |
| parent | 358074b2960b369dfd248bd31e08db93e114a4aa (diff) | |
| download | minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.tar.gz minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.tar.bz2 minetest-90808a4f34dca379e872074bdfd472faf1c48cf3.zip | |
Real control fix (#5787)
* Allow enabling and disabling mods.
* Re-fix 605599b6f150b89ba6539c4d088231b326adcb48
This breaks some chars like € in chat.
Instead verify is char is a non control char -> iswcntrl
Diffstat (limited to 'src/mods.h')
| -rw-r--r-- | src/mods.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mods.h b/src/mods.h index 1e62db54d..7455a51ea 100644 --- a/src/mods.h +++ b/src/mods.h @@ -99,6 +99,8 @@ protected: // adds all mods in the set. void addMods(const std::vector<ModSpec> &new_mods); + void addModsFormConfig(const std::string &settings_path, const std::set<std::string> &mods); + void checkConflictsAndDeps(); private: // move mods from m_unsatisfied_mods to m_sorted_mods |