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

Fix crash when loading particle texture inside track folder

Browse Source
This commit is contained in:
Benau 2016-12-30 13:28:13 +08:00
parent 1e2a759f7b
commit caf9dbab0c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tracks/track.cpp
View File

@ -280,6 +280,15 @@ void Track::reset()
*/
void Track::cleanup()
{
#ifdef USE_RESIZE_CACHE
if (!UserConfigParams::m_high_definition_textures)
{
file_manager->popTextureSearchPath();
}
#endif
file_manager->popTextureSearchPath();
file_manager->popModelSearchPath();
Graph::destroy();
ItemManager::destroy();
#ifndef SERVER_ONLY
@ -931,7 +940,7 @@ void Track::convertTrackToBullet(scene::ISceneNode *node)
TriangleMesh *tmesh = m_track_mesh;
if(t)
{
std::string image = std::string(core::stringc(t->getName()).c_str());
std::string image = t->getName().getPtr();
// the third boolean argument is false because at this point we're
// dealing physics, so it's useless to warn about missing textures,
@ -1422,7 +1431,7 @@ void Track::handleAnimatedTextures(scene::ISceneNode *node, const XMLNode &xml)
video::ITexture* t=irrMaterial.getTexture(j);
if(!t) continue;
std::string texture_name =
StringUtils::getBasename(core::stringc(t->getName()).c_str());
StringUtils::getBasename(t->getName().getPtr());
// to lower case, for case-insensitive comparison
texture_name = StringUtils::toLowerCase(texture_name);
@ -1833,15 +1842,6 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
irr_driver->setClearbackBufferColor(m_sky_color);
}
#ifdef USE_RESIZE_CACHE
if (!UserConfigParams::m_high_definition_textures)
{
file_manager->popTextureSearchPath();
}
#endif
file_manager->popTextureSearchPath();
file_manager->popModelSearchPath ();
// ---- Set ambient color
m_ambient_color = m_default_ambient_color;
irr_driver->setAmbientLight(m_ambient_color,