diff options
| author | sfan5 <sfan5@live.de> | 2020-04-10 21:45:07 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-04-11 13:12:51 +0200 |
| commit | f105bc8dc2444d98a9cd74a2caa0013ce2e07008 (patch) | |
| tree | b426284edab83f8bda3fbc469d4488c9c1d3b059 /src/client | |
| parent | aa3cf400e2ca4096517e926dbae5b6337b2f1876 (diff) | |
| download | minetest-f105bc8dc2444d98a9cd74a2caa0013ce2e07008.tar.gz minetest-f105bc8dc2444d98a9cd74a2caa0013ce2e07008.tar.bz2 minetest-f105bc8dc2444d98a9cd74a2caa0013ce2e07008.zip | |
A few initialization cleanups
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.cpp | 8 | ||||
| -rw-r--r-- | src/client/game.cpp | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/client/client.cpp b/src/client/client.cpp index c9cd24cb3..c3e2a4d2a 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -178,7 +178,7 @@ void Client::loadMods() infostream << mod.name << " "; infostream << std::endl; - // Load and run "mod" scripts + // Load "mod" scripts for (const ModSpec &mod : m_mods) { if (!string_allowed(mod.name, MODNAME_ALLOWED_CHARS)) { throw ModError("Error loading mod \"" + mod.name + @@ -188,7 +188,7 @@ void Client::loadMods() scanModIntoMemory(mod.name, mod.path); } - // Load and run "mod" scripts + // Run them for (const ModSpec &mod : m_mods) m_script->loadModFromMemory(mod.name); @@ -197,10 +197,14 @@ void Client::loadMods() // Run a callback when mods are loaded m_script->on_mods_loaded(); + + // Create objects if they're ready if (m_state == LC_Ready) m_script->on_client_ready(m_env.getLocalPlayer()); if (m_camera) m_script->on_camera_ready(m_camera); + if (m_minimap) + m_script->on_minimap_ready(m_minimap); } bool Client::checkBuiltinIntegrity() diff --git a/src/client/game.cpp b/src/client/game.cpp index 437cc7871..505108caf 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1407,8 +1407,11 @@ bool Game::createClient(const std::string &playername, } mapper = client->getMinimap(); - if (mapper) + if (mapper) { mapper->setMinimapMode(MINIMAP_MODE_OFF); + if (client->modsLoaded()) + client->getScript()->on_minimap_ready(mapper); + } return true; } |