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

Fix warning when eliminate a kart in battle mode

Browse Source
This commit is contained in:
Benau 2016-10-08 08:35:07 +08:00
parent 5c4b61a26e
commit 59edb96489
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/texture_manager.cpp
View File

@ -34,8 +34,8 @@
GLuint getTextureGLuint(irr::video::ITexture *tex)
{
if (tex == NULL)
return 0;
if (tex == NULL)
return 0;
#if defined(USE_GLES2)
return static_cast<irr::video::COGLES2Texture*>(tex)->getOpenGLTextureName();
#else

3
src/tracks/track_object_presentation.cpp
View File

@ -405,7 +405,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
World::getWorld()->getIdent() == IDENT_CUTSCENE);
m_model_file = model_file;
file_manager->pushTextureSearchPath(StringUtils::getPath(model_file));
if (file_manager->fileExists(model_file))
{
if (animated)
@ -419,6 +419,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
throw std::runtime_error("Model '" + model_file + "' cannot be found");
}
file_manager->popTextureSearchPath();
init(NULL, NULL, true);
} // TrackObjectPresentationMesh