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

Removed more unnecessary '//' in paths.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-01-28 21:21:49 +00:00
parent d7518e7800
commit 52cc6a5271
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/particle_emitter.cpp
View File

@ -378,7 +378,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
}
else
{
m_node->setMaterialTexture(0, irr_driver->getTexture((file_manager->getDataDir() + "/gui/main_help.png").c_str()));
m_node->setMaterialTexture(0, irr_driver->getTexture((file_manager->getDataDir() + "gui/main_help.png").c_str()));
}

2
src/guiengine/skin.cpp
View File

@ -2160,7 +2160,7 @@ ITexture* Skin::getImage(const char* name)
else
{
return irr_driver->getTexture(
file_manager->getDataDir() + "/gui/main_help.png");
file_manager->getDataDir() + "gui/main_help.png");
}
} // getImage

4
src/guiengine/widgets/ribbon_widget.cpp
View File

@ -231,7 +231,7 @@ void RibbonWidget::add()
GUIEngine::getGUIEnv()->addButton(icon_part, subbtn,
same_id, L"");
icon->setScaleImage(true);
std::string filename = file_manager->getDataDir() + "/"
std::string filename = file_manager->getDataDir()
+ m_children[i].m_properties[PROP_ICON];
icon->setImage( irr_driver->getTexture(filename.c_str()) );
icon->setUseAlphaChannel(true);
@ -294,7 +294,7 @@ void RibbonWidget::add()
(float)m_children[i].m_w / (float)m_children[i].m_h;
// calculate the size of the image
std::string filename = file_manager->getDataDir()+"/"
std::string filename = file_manager->getDataDir()
+ m_children[i].m_properties[PROP_ICON];
video::ITexture* image =
irr_driver->getTexture((filename).c_str());

4
src/guiengine/widgets/spinner_widget.cpp
View File

@ -196,7 +196,7 @@ ITexture* SpinnerWidget::getTexture()
{
assert(m_graphical);
std::ostringstream icon_stream;
icon_stream << file_manager->getDataDir() << "/" << m_properties[PROP_ICON];
icon_stream << file_manager->getDataDir() << m_properties[PROP_ICON];
std::string imagefile = StringUtils::insertValues(icon_stream.str(), m_value);
ITexture* texture = irr_driver->getTexture(imagefile);
return texture;
@ -338,7 +338,7 @@ void SpinnerWidget::setValue(const int new_value)
if (m_graphical)
{
std::ostringstream icon;
icon << file_manager->getDataDir() << "/" << m_properties[PROP_ICON];
icon << file_manager->getDataDir() << m_properties[PROP_ICON];
std::string imagefile = StringUtils::insertValues(icon.str(), m_value);
((IGUIImage*)(m_children[1].m_element))->setImage(irr_driver->getTexture(imagefile));
}

3
src/states_screens/feature_unlocked.cpp
View File

@ -715,7 +715,7 @@ void FeatureUnlockedCutScene::addUnlockedThings(const std::vector<const Challeng
{
const RaceManager::MinorRaceModeType mode =
RaceManager::getModeIDFromInternalName(unlockedFeatures[i].m_name);
const std::string icon = file_manager->getDataDir() + "/" + RaceManager::getIconOf(mode);
const std::string icon = file_manager->getDataDir() + RaceManager::getIconOf(mode);
addUnlockedPicture( irr_driver->getTexture(icon.c_str()), 0.8f, 0.8f,
unlockedFeatures[i].getUnlockedMessage() );
break;
@ -830,4 +830,3 @@ MusicInformation* FeatureUnlockedCutScene::getInGameMenuMusic() const
MusicInformation* mi = music_manager->getMusicInformation("win_theme.music");
return mi;
}