diff options
| author | Kahrl <kahrl@gmx.net> | 2013-05-03 23:58:22 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2013-05-03 23:58:22 +0200 |
| commit | 969d2b3eb1f30e257823d9220697e47735be68e3 (patch) | |
| tree | f94b2176f4a145eef3c8bea452ea788ef2810ec0 /src/server.cpp | |
| parent | a031a1548783f1dd4d6b357fef391647dfb35ce3 (diff) | |
| download | minetest-969d2b3eb1f30e257823d9220697e47735be68e3.tar.xz | |
Optional dependencies and properly handle mod name conflicts again
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server.cpp b/src/server.cpp index 37bb7a35c..bf48a40d5 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -707,11 +707,11 @@ Server::Server( ModConfiguration modconf(m_path_world); m_mods = modconf.getMods(); - std::list<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods(); + std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods(); // complain about mods with unsatisfied dependencies if(!modconf.isConsistent()) { - for(std::list<ModSpec>::iterator it = unsatisfied_mods.begin(); + for(std::vector<ModSpec>::iterator it = unsatisfied_mods.begin(); it != unsatisfied_mods.end(); ++it) { ModSpec mod = *it; @@ -745,7 +745,7 @@ Server::Server( for(std::vector<ModSpec>::iterator it = m_mods.begin(); it != m_mods.end(); ++it) load_mod_names.erase((*it).name); - for(std::list<ModSpec>::iterator it = unsatisfied_mods.begin(); + for(std::vector<ModSpec>::iterator it = unsatisfied_mods.begin(); it != unsatisfied_mods.end(); ++it) load_mod_names.erase((*it).name); if(!load_mod_names.empty()) |