luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 00:25:19 +02:00
Code Activity

A few initialization cleanups

Browse Source
This commit is contained in:
sfan5
2020-04-10 21:45:07 +02:00
committed by Loïc Blot
parent aa3cf400e2
commit f105bc8dc2
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/client.cpp
View File

@@ -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()

5
src/client/game.cpp
View File

@@ -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;
}