From 2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6 Mon Sep 17 00:00:00 2001 From: Paramat Date: Sat, 24 Nov 2018 10:41:11 +0000 Subject: CSM: Don't create the client script environment if CSM is disabled (#7874) Use the CSM death formspec when CSM is enabled and use the engine death formspec when CSM is disabled. Move the CSM death formspec code to a dedicated file. --- src/client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index 423db870a..68a832d8e 100644 --- a/src/client.h +++ b/src/client.h @@ -141,7 +141,6 @@ public: DISABLE_CLASS_COPY(Client); // Load local mods into memory - 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) @@ -400,6 +399,7 @@ public: ClientScripting *getScript() { return m_script; } const bool moddingEnabled() const { return m_modding_enabled; } + const bool modsLoaded() const { return m_mods_loaded; } void pushToEventQueue(ClientEvent *event); -- cgit v1.2.3