diff options
| author | Paramat <paramat@users.noreply.github.com> | 2018-11-24 10:41:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 10:41:11 +0000 |
| commit | 2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6 (patch) | |
| tree | 4f607e1f226fa169c2bd98de531b62cba4de3260 /src/client.h | |
| parent | a969635322576218312be3e32e5b4fcb0359ac05 (diff) | |
| download | dragonfireclient-2e37ee956530b7cd310e0d6cfb8ce3cd8f6973e6.tar.xz | |
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.
Diffstat (limited to 'src/client.h')
| -rw-r--r-- | src/client.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |