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

Remove error when dropping tires in battle mode when kart dead

Browse Source
This commit is contained in:
Benau 2017-01-11 13:33:54 +08:00
parent 3bffe1f1a7
commit 3105407b2f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracks/track_object_presentation.cpp
View File

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

1
src/tracks/track_object_presentation.hpp
View File

@ -185,6 +185,7 @@ public:
class TrackObjectPresentationLibraryNode : public TrackObjectPresentationSceneNode
{
TrackObject* m_parent;
using TrackObjectPresentationSceneNode::move;
public:
TrackObjectPresentationLibraryNode(TrackObject* parent,
const XMLNode& xml_node,