oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Fix mod paths

Browse source
This commit is contained in:
Perttu Ahola 2012-03-20 01:06:44 +02:00
parent db4911f956
commit 50621ffe85
3 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/server.cpp
View file

@ -885,25 +885,13 @@ Server::Server(
infostream<<"- world: "<<m_path_world<<std::endl;
infostream<<"- config: "<<m_path_config<<std::endl;
infostream<<"- game: "<<m_gamespec.path<<std::endl;
for(std::set<std::string>::const_iterator i = m_gamespec.addon_paths.begin();
i != m_gamespec.addon_paths.end(); i++)
infostream<<"- addons: "<<(*i)<<std::endl;
// Path to builtin.lua
std::string builtinpath = porting::path_share + DIR_DELIM + "builtin"
+ DIR_DELIM + "builtin.lua";
// Add default global mod search path
m_modspaths.push_front(m_gamespec.path + DIR_DELIM "mods");
// Add world mod search path
m_modspaths.push_front(m_path_world + DIR_DELIM + "worldmods");
// Add addon mod search path
for(std::set<std::string>::const_iterator i = m_gamespec.addon_paths.begin();
i != m_gamespec.addon_paths.end(); i++)
m_modspaths.push_front((*i) + DIR_DELIM + "mods");
// Add simple user mod search path
m_modspaths.push_front(porting::path_user + DIR_DELIM + "mods"
+ DIR_DELIM + m_gamespec.id);
for(std::set<std::string>::const_iterator i = m_gamespec.mods_paths.begin();
i != m_gamespec.mods_paths.end(); i++)
m_modspaths.push_front((*i));
// Print out mod search paths
for(core::list<std::string>::Iterator i = m_modspaths.begin();
@ -912,6 +900,10 @@ Server::Server(
infostream<<"- mods: "<<modspath<<std::endl;
}
// Path to builtin.lua
std::string builtinpath = porting::path_share + DIR_DELIM + "builtin"
+ DIR_DELIM + "builtin.lua";
// Create world if it doesn't exist
if(!initializeWorld(m_path_world, m_gamespec.id))
throw ServerError("Failed to initialize world");