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

Minor cleanup: renamed resetAllKarts back to unloadAllKarts (to avoid

Browse Source 
confusion since resetAllKarts in world is called before a race),
and removed unused function.
This commit is contained in:
hiker 2014-01-29 15:09:28 +11:00
parent 9192557cd4
commit 2479000137
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/irr_driver.cpp
View File

@ -652,7 +652,7 @@ void IrrDriver::applyResolutionSettings()
attachment_manager->removeTextures();
projectile_manager->removeTextures();
ItemManager::removeTextures();
kart_properties_manager->resetAllKarts();
kart_properties_manager->unloadAllKarts();
powerup_manager->unloadPowerups();
Referee::cleanup();
ParticleKindManager::get()->cleanup();
@ -705,7 +705,7 @@ void IrrDriver::applyResolutionSettings()
file_manager->popTextureSearchPath();
kart_properties_manager->loadAllKarts(false);
kart_properties_manager->loadAllKarts();
attachment_manager->loadModels();
std::string banana = file_manager->getAsset(FileManager::GUI, "banana.png");

17
src/karts/kart_properties_manager.cpp
View File

@ -64,6 +64,9 @@ void KartPropertiesManager::addKartSearchDir(const std::string &s)
} // addKartSearchDir
//-----------------------------------------------------------------------------
/** Removes all karts from the KartPropertiesManager, so that they can be
* reloade. This is necessary after a change of the screen resolution.
*/
void KartPropertiesManager::unloadAllKarts()
{
m_karts_properties.clearAndDeleteAll();
@ -71,22 +74,8 @@ void KartPropertiesManager::unloadAllKarts()
m_kart_available.clear();
m_groups_2_indices.clear();
m_all_groups.clear();
m_kart_search_path.clear();
} // unloadAllKarts
//-----------------------------------------------------------------------------
/** Unloads all karts but doesn't clear m_kart_search_path. This is used
* when changing the screen resolution.
*/
void KartPropertiesManager::resetAllKarts()
{
m_karts_properties.clearAndDeleteAll();
m_selected_karts.clear();
m_kart_available.clear();
m_groups_2_indices.clear();
m_all_groups.clear();
} // reLoadAllKarts
//-----------------------------------------------------------------------------
/** Remove a kart from the kart manager.
* \param id The kart id (i.e. name of the directory) to remove.

1
src/karts/kart_properties_manager.hpp
View File

@ -77,7 +77,6 @@ public:
bool loadKart (const std::string &dir);
void loadAllKarts (bool loading_icon = true);
void unloadAllKarts ();
void resetAllKarts ();
void removeKart(const std::string &id);
const std::vector<int> getKartsInGroup (const std::string& g);
bool kartAvailable(int kartid);