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

misc minor stuff

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2014-01-01 21:21:48 +00:00
parent 0f97aee66a
commit 93643d660f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/material.cpp
View File

@ -644,7 +644,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
(m->getTexture(0) != NULL && (m->getTexture(0) != NULL &&
((core::stringc)m->getTexture(0)->getName()).find("deprecated") != -1)) ((core::stringc)m->getTexture(0)->getName()).find("deprecated") != -1))
{ {
Log::warn("material", "Track uses deprecated texture '%s'\n", Log::warn("material", "Track uses deprecated texture '%s'",
m_texname.c_str()); m_texname.c_str());
} }

9
src/states_screens/dialogs/addons_loading.cpp
View File

@ -132,10 +132,11 @@ void AddonsLoading::beforeAddingWidgets()
else if(m_addon.testStatus(Addon::AS_RC)) else if(m_addon.testStatus(Addon::AS_RC))
l.push_back("RC"); l.push_back("RC");
if(m_addon.testStatus(Addon::AS_BAD_DIM)) // Don't displat those for now, they're more confusing than helpful for the average player
l.push_back("bad-texture"); //if(m_addon.testStatus(Addon::AS_BAD_DIM))
if(!m_addon.testStatus(Addon::AS_DFSG)) // l.push_back("bad-texture");
l.push_back("non-DFSG"); //if(!m_addon.testStatus(Addon::AS_DFSG))
// l.push_back("non-DFSG");
} }
if(m_addon.testStatus(Addon::AS_FEATURED)) if(m_addon.testStatus(Addon::AS_FEATURED))
l.push_back(_("featured")); l.push_back(_("featured"));

2
src/tracks/track_object_presentation.cpp
View File

@ -131,7 +131,7 @@ TrackObjectPresentationLOD::TrackObjectPresentationLOD(const XMLNode& xml_node,
TrackObjectPresentationSceneNode(xml_node) TrackObjectPresentationSceneNode(xml_node)
{ {
m_node = lod_loader.instanciate(&xml_node, parent); m_node = lod_loader.instanciate(&xml_node, parent);
if (m_node == NULL) throw std::exception("Cannot load LOD node"); if (m_node == NULL) throw std::runtime_error("Cannot load LOD node");
m_node->setPosition(m_init_xyz); m_node->setPosition(m_init_xyz);
m_node->setRotation(m_init_hpr); m_node->setRotation(m_init_hpr);
m_node->setScale(m_init_scale); m_node->setScale(m_init_scale);