ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More code simplification (removed m_type).

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-12-30 05:23:04 +00:00
parent 9097ece07c
commit 809558f1cc
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/states_screens/addons_screen.cpp
View File

@ -64,7 +64,6 @@ void AddonsScreen::init()
{
Screen::init();
getWidget<GUIEngine::RibbonWidget>("category")->setDeactivated();
m_type = "kart";
std::cout << "[Addons] Using directory <" + file_manager->getAddonsDir()
<< ">\n";
@ -80,6 +79,10 @@ void AddonsScreen::init()
} // init
// ----------------------------------------------------------------------------
/** Loads the list of all addons of the given type. The gui element will be
* updated.
* \param type Must be 'kart' or 'track'.
*/
void AddonsScreen::loadList(const std::string &type)
{
GUIEngine::ListWidget* w_list =
@ -88,23 +91,19 @@ void AddonsScreen::loadList(const std::string &type)
for(unsigned int i=0; i<addons_manager->getNumAddons(); i++)
{
const Addon &addon = addons_manager->getAddon(i);
// Ignore addons of a different type
if(addon.getType()!=type) continue;
std::cout << addon.getName()<< std::endl;
// Get the right icon to display
int icon;
if(addon.isInstalled() && addon.needsUpdate())
{
w_list->addItem(addon.getId(), addon.getName().c_str(),
m_icon_needs_update);
}
else if(addon.isInstalled())
{
w_list->addItem(addon.getId(), addon.getName().c_str(),
m_icon_installed);
}
icon = addon.needsUpdate() ? m_icon_needs_update
: m_icon_installed;
else
{
w_list->addItem(addon.getId(), addon.getName().c_str(),
m_icon_not_installed);
}
icon = m_icon_not_installed;
w_list->addItem(addon.getId(), addon.getName().c_str(),
icon);
}
m_can_load_list = false;
@ -147,12 +146,10 @@ void AddonsScreen::eventCallback(GUIEngine::Widget* widget,
StateManager::get()->replaceTopMostScreen(AddonsUpdateScreen::getInstance());
else if (selection == "tab_track")
{
m_type = "track";
loadList("track");
}
else if (selection == "tab_kart")
{
m_type = "kart";
loadList("kart");
}
}

1
src/states_screens/addons_screen.hpp
View File

@ -59,7 +59,6 @@ class AddonsScreen : public GUIEngine::Screen,
public:
bool m_can_load_list;
std::string m_type;
/** Load the addons into the main list.*/
void loadList(const std::string &type);

2
src/states_screens/addons_update_screen.cpp
View File

@ -71,13 +71,11 @@ void AddonsUpdateScreen::eventCallback(GUIEngine::Widget* widget,
if (selection == "tab_track")
{
StateManager::get()->replaceTopMostScreen(AddonsScreen::getInstance());
AddonsScreen::getInstance()->m_type = "track";
AddonsScreen::getInstance()->loadList("track");
}
else if (selection == "tab_kart")
{
StateManager::get()->replaceTopMostScreen(AddonsScreen::getInstance());
AddonsScreen::getInstance()->m_type = "kart";
AddonsScreen::getInstance()->loadList("kart");
}
}