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

Final fix for issue #13.

Browse Source
This commit is contained in:
KristofDM 2014-01-27 18:14:50 +01:00
parent 9c29ae0b26
commit fca20ae088
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/irr_driver.cpp
View File

@ -651,8 +651,8 @@ void IrrDriver::applyResolutionSettings()
attachment_manager->removeTextures();
projectile_manager->removeTextures();
ItemManager::removeTextures();
kart_properties_manager -> unloadAllKarts();
powerup_manager-> unloadPowerups();
kart_properties_manager->resetAllKarts();
powerup_manager->unloadPowerups();
Referee::cleanup();
ParticleKindManager::get()->cleanup();
delete input_manager;
@ -704,8 +704,7 @@ void IrrDriver::applyResolutionSettings()
file_manager->popTextureSearchPath();
KartPropertiesManager::addKartSearchDir(file_manager->getAddonsFile("karts"));
kart_properties_manager->loadAllKarts();
kart_properties_manager->loadAllKarts(false);
attachment_manager->loadModels();
std::string banana = file_manager->getAsset(FileManager::GUI, "banana.png");

5
src/karts/kart_properties_manager.cpp
View File

@ -75,17 +75,16 @@ void KartPropertiesManager::unloadAllKarts()
} // unloadAllKarts
//-----------------------------------------------------------------------------
/** Reloads all karts, i.e. reloads the meshes and textures. This is used
/** Unloads all karts but doesn't clear m_kart_search_path. This is used
* when changing the screen resolution.
*/
void KartPropertiesManager::reLoadAllKarts()
void KartPropertiesManager::resetAllKarts()
{
m_karts_properties.clearAndDeleteAll();
m_selected_karts.clear();
m_kart_available.clear();
m_groups_2_indices.clear();
m_all_groups.clear();
loadAllKarts(false);
} // reLoadAllKarts
//-----------------------------------------------------------------------------

2
src/karts/kart_properties_manager.hpp
View File

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