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/client.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index 06c67105f..6093d6a6f 100644 --- a/src/client.h +++ b/src/client.h @@ -140,7 +140,7 @@ public: DISABLE_CLASS_COPY(Client); // Load local mods into memory - void loadMods(); + void loadBuiltin(); void scanModSubfolder(const std::string &mod_name, const std::string &mod_path, std::string mod_subpath); inline void scanModIntoMemory(const std::string &mod_name, const std::string &mod_path) @@ -148,9 +148,6 @@ public: scanModSubfolder(mod_name, mod_path, ""); } - // Initizle the mods - void initMods(); - /* request all threads managed by client to be stopped */ @@ -433,6 +430,8 @@ public: ModChannel *getModChannel(const std::string &channel); private: + void loadMods(); + bool checkBuiltinIntegrity(); // Virtual methods from con::PeerHandler void peerAdded(con::Peer *peer); @@ -536,6 +535,7 @@ private: std::queue m_client_event_queue; bool m_itemdef_received = false; bool m_nodedef_received = false; + bool m_mods_loaded = false; ClientMediaDownloader *m_media_downloader; // time_of_day speed approximation for old protocol -- cgit v1.2.3