From 308bb69eefdfb2ff3b893c124ccf0321d99a1bfd Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Mon, 11 Dec 2017 17:33:44 +0100 Subject: 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 --- src/game.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/game.cpp') 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()) { -- cgit v1.2.3