moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-17 14:55:13 -05:00
Code Issues Releases Wiki Activity

Merge pull request #465 from doserj/mod_selection_empty_modname_fix

Browse Source 
Remove use of operator[] on a std::map, so no spurious elements get inse...
This commit is contained in:
kwolekr 2013-02-15 17:45:32 -08:00
commit 8d920dd09b
1 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/guiConfigureWorld.cpp
View File

@ -414,8 +414,9 @@ bool GUIConfigureWorld::OnEvent(const SEvent& event)
else if(selected_node != NULL && selected_node->getText() != NULL) else if(selected_node != NULL && selected_node->getText() != NULL)
{ {
std::string modname = wide_to_narrow(selected_node->getText()); std::string modname = wide_to_narrow(selected_node->getText());
ModSpec mod = m_addonmods[modname]; std::map<std::string, ModSpec>::iterator mod_it = m_addonmods.find(modname);
enableAllMods(mod.modpack_content,true); if(mod_it != m_addonmods.end())
enableAllMods(mod_it->second.modpack_content,true);
} }
return true; return true;
} }
@ -427,8 +428,9 @@ bool GUIConfigureWorld::OnEvent(const SEvent& event)
if(selected_node != NULL && selected_node->getText() != NULL) if(selected_node != NULL && selected_node->getText() != NULL)
{ {
std::string modname = wide_to_narrow(selected_node->getText()); std::string modname = wide_to_narrow(selected_node->getText());
ModSpec mod = m_addonmods[modname]; std::map<std::string, ModSpec>::iterator mod_it = m_addonmods.find(modname);
enableAllMods(mod.modpack_content,false); if(mod_it != m_addonmods.end())
enableAllMods(mod_it->second.modpack_content,false);
} }
return true; return true;
} }
@ -560,42 +562,49 @@ void GUIConfigureWorld::adjustSidebar()
modname_w = L"N/A"; modname_w = L"N/A";
std::string modname = wide_to_narrow(modname_w); std::string modname = wide_to_narrow(modname_w);
// if no mods installed, don't show buttons or checkbox on the sidebar ModSpec mspec;
std::map<std::string, ModSpec>::iterator it = m_addonmods.find(modname);
if(it != m_addonmods.end())
mspec = it->second;
m_dependencies_listbox->clear();
m_rdependencies_listbox->clear();
// if no mods installed, there is nothing to enable/disable, so we
// don't show buttons or checkbox on the sidebar
if(node->getParent() == m_treeview->getRoot() && !node->hasChilds()) if(node->getParent() == m_treeview->getRoot() && !node->hasChilds())
{ {
m_disableall->setVisible(false); m_disableall->setVisible(false);
m_enableall->setVisible(false); m_enableall->setVisible(false);
m_enabled_checkbox->setVisible(false); m_enabled_checkbox->setVisible(false);
return;
} }
else
{ // a modpack is not enabled/disabled by itself, only its cotnents
// if modpack, show enable/disable all buttons. otherwise, show // are. so we show show enable/disable all buttons, but hide the
// enabled checkbox // checkbox
if(node->getParent() == m_treeview->getRoot() || if(node->getParent() == m_treeview->getRoot() ||
m_addonmods[modname].is_modpack) mspec.is_modpack)
{ {
m_enabled_checkbox->setVisible(false); m_enabled_checkbox->setVisible(false);
m_disableall->setVisible(true); m_disableall->setVisible(true);
m_enableall->setVisible(true); m_enableall->setVisible(true);
m_modname_text->setText((L"Modpack: "+modname_w).c_str()); m_modname_text->setText((L"Modpack: "+modname_w).c_str());
return;
} }
else
{ // for a normal mod, we hide the enable/disable all buttons, but show the checkbox.
m_disableall->setVisible(false); m_disableall->setVisible(false);
m_enableall->setVisible(false); m_enableall->setVisible(false);
m_enabled_checkbox->setVisible(true); m_enabled_checkbox->setVisible(true);
m_modname_text->setText((L"Mod: "+modname_w).c_str()); m_modname_text->setText((L"Mod: "+modname_w).c_str());
}
}
// the mod is enabled unless it is disabled in the world.mt settings. // the mod is enabled unless it is disabled in the world.mt settings.
bool mod_enabled = true; bool mod_enabled = true;
if(m_settings.exists("load_mod_"+modname)) if(m_settings.exists("load_mod_"+modname))
mod_enabled = m_settings.getBool("load_mod_"+modname); mod_enabled = m_settings.getBool("load_mod_"+modname);
m_enabled_checkbox->setChecked(mod_enabled); m_enabled_checkbox->setChecked(mod_enabled);
// dependencies of this mod:
m_dependencies_listbox->clear();
ModSpec mspec = m_addonmods[modname];
for(std::set<std::string>::iterator it=mspec.depends.begin(); for(std::set<std::string>::iterator it=mspec.depends.begin();
it != mspec.depends.end(); ++it) it != mspec.depends.end(); ++it)
{ {
@ -611,9 +620,7 @@ void GUIConfigureWorld::adjustSidebar()
m_dependencies_listbox->addItem(narrow_to_wide(dependency).c_str()); m_dependencies_listbox->addItem(narrow_to_wide(dependency).c_str());
} }
// reverse dependencies of this mod: // reverse dependencies of this mod:
m_rdependencies_listbox->clear();
std::pair< std::multimap<std::string, std::string>::iterator, std::pair< std::multimap<std::string, std::string>::iterator,
std::multimap<std::string, std::string>::iterator > rdep = std::multimap<std::string, std::string>::iterator > rdep =
m_reverse_depends.equal_range(modname); m_reverse_depends.equal_range(modname);
@ -639,11 +646,18 @@ void GUIConfigureWorld::enableAllMods(std::map<std::string, ModSpec> mods,bool e
enableAllMods(mod.modpack_content,enable); enableAllMods(mod.modpack_content,enable);
else // not a modpack else // not a modpack
setEnabled(mod.name, enable); setEnabled(mod.name, enable);
} }
} }
void GUIConfigureWorld::enableMod(std::string modname) void GUIConfigureWorld::enableMod(std::string modname)
{ {
std::map<std::string, ModSpec>::iterator mod_it = m_addonmods.find(modname);
if(mod_it == m_addonmods.end()){
errorstream << "enableMod() called with invalid mod name \"" << modname << "\"" << std::endl;
return;
}
ModSpec mspec = mod_it->second;
m_settings.setBool("load_mod_"+modname,true); m_settings.setBool("load_mod_"+modname,true);
std::map<std::string,gui::IGUITreeViewNode*>::iterator it = std::map<std::string,gui::IGUITreeViewNode*>::iterator it =
m_nodes.find(modname); m_nodes.find(modname);
@ -651,7 +665,6 @@ void GUIConfigureWorld::enableMod(std::string modname)
(*it).second->setIcon(CHECKMARK_STR); (*it).second->setIcon(CHECKMARK_STR);
m_new_mod_names.erase(modname); m_new_mod_names.erase(modname);
//also enable all dependencies //also enable all dependencies
ModSpec mspec = m_addonmods[modname];
for(std::set<std::string>::iterator it=mspec.depends.begin(); for(std::set<std::string>::iterator it=mspec.depends.begin();
it != mspec.depends.end(); ++it) it != mspec.depends.end(); ++it)
{ {
@ -664,6 +677,12 @@ void GUIConfigureWorld::enableMod(std::string modname)
void GUIConfigureWorld::disableMod(std::string modname) void GUIConfigureWorld::disableMod(std::string modname)
{ {
std::map<std::string, ModSpec>::iterator mod_it = m_addonmods.find(modname);
if(mod_it == m_addonmods.end()){
errorstream << "disableMod() called with invalid mod name \"" << modname << "\"" << std::endl;
return;
}
m_settings.setBool("load_mod_"+modname,false); m_settings.setBool("load_mod_"+modname,false);
std::map<std::string,gui::IGUITreeViewNode*>::iterator it = std::map<std::string,gui::IGUITreeViewNode*>::iterator it =
m_nodes.find(modname); m_nodes.find(modname);