diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-12-11 17:33:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 17:33:44 +0100 |
| commit | 308bb69eefdfb2ff3b893c124ccf0321d99a1bfd (patch) | |
| tree | 80fa4808475690f80510dcd6779d671ddbbcbd84 /src/game.cpp | |
| parent | 02cc257fe09ee0a68f3c09e0cbe48cbbda29a71c (diff) | |
| download | minetest-308bb69eefdfb2ff3b893c124ccf0321d99a1bfd.tar.gz minetest-308bb69eefdfb2ff3b893c124ccf0321d99a1bfd.tar.bz2 minetest-308bb69eefdfb2ff3b893c124ccf0321d99a1bfd.zip | |
CSM fixes: load mods after flavours & add flavour to block mod loading (#6738)
* CSM fixes: load mods after flavours & add flavour to block mod loading
* Don't permit to load mods twice
* Prepare builtin integrity global algorithm
* Add missing doc & use a nicer byteflag for LOAD_CLIENT_MODS flavour
* flag typo fix
* Invert CSM_FL_LOOKUP_NODES & CSM_FL_LOAD_CLIENT_MODS ids
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index fca9c5e68..ee2b19933 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2049,7 +2049,7 @@ bool Game::initGui() // Make sure the size of the recent messages buffer is right chat_backend->applySettings(); - + // Chat backend and console gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(), -1, chat_backend, client, &g_menumgr); @@ -2146,8 +2146,7 @@ bool Game::connectToServer(const std::string &playername, fps_control.last_time = RenderingEngine::get_timer_time(); - client->loadMods(); - client->initMods(); + client->loadBuiltin(); while (RenderingEngine::run()) { |