diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp index 784dc50ba..a2ded0e37 100644 --- a/src/graphics/particle_emitter.cpp +++ b/src/graphics/particle_emitter.cpp @@ -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())); } diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp index 73f6c65b9..54a549e24 100644 --- a/src/guiengine/skin.cpp +++ b/src/guiengine/skin.cpp @@ -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 diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp index 88ac27f43..ecf2f4c6d 100644 --- a/src/guiengine/widgets/ribbon_widget.cpp +++ b/src/guiengine/widgets/ribbon_widget.cpp @@ -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()); diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp index 36757ddb4..bc0a8a5bd 100644 --- a/src/guiengine/widgets/spinner_widget.cpp +++ b/src/guiengine/widgets/spinner_widget.cpp @@ -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)); } diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp index 14156bfac..f9315e2ea 100644 --- a/src/states_screens/feature_unlocked.cpp +++ b/src/states_screens/feature_unlocked.cpp @@ -715,7 +715,7 @@ void FeatureUnlockedCutScene::addUnlockedThings(const std::vectorgetDataDir() + "/" + 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; } -