oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

CSM fixes: load mods after flavours & add flavour to block mod loading (#6738)

Browse source 
* 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
This commit is contained in:
Loïc Blot 2017-12-11 17:33:44 +01:00 • committed by GitHub
parent 02cc257fe0
commit 308bb69eef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client.h
View file

@ -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<ClientEvent *> 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