diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 11:07:03 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 11:07:03 +0300 |
| commit | 969fbb189d16d87d26ceab29795644588fb90a32 (patch) | |
| tree | a67a53a3ec9bd1afffda372587a9205d3ba8ef96 /src/mapblockobject.cpp | |
| parent | a8acf3c391b4dbdc4f4fd12b7a491a1c38dab337 (diff) | |
| download | minetest-969fbb189d16d87d26ceab29795644588fb90a32.tar.gz minetest-969fbb189d16d87d26ceab29795644588fb90a32.tar.bz2 minetest-969fbb189d16d87d26ceab29795644588fb90a32.zip | |
All textures are are now searched first from the directory specified by the texture_path setting.
Diffstat (limited to 'src/mapblockobject.cpp')
| -rw-r--r-- | src/mapblockobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp index d05eee808..009163a18 100644 --- a/src/mapblockobject.cpp +++ b/src/mapblockobject.cpp @@ -283,7 +283,7 @@ void RatObject::addToScene(scene::ISceneManager *smgr) buf->getMaterial().setFlag(video::EMF_LIGHTING, false); buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); buf->getMaterial().setTexture - (0, driver->getTexture(porting::getDataPath("rat.png").c_str())); + (0, driver->getTexture(getTexturePath("rat.png").c_str())); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; @@ -413,7 +413,7 @@ void PlayerObject::addToScene(scene::ISceneManager *smgr) // Set material buf->getMaterial().setFlag(video::EMF_LIGHTING, false); //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player.png").c_str())); + buf->getMaterial().setTexture(0, driver->getTexture(getTexturePath("player.png").c_str())); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); //buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; @@ -437,7 +437,7 @@ void PlayerObject::addToScene(scene::ISceneManager *smgr) // Set material buf->getMaterial().setFlag(video::EMF_LIGHTING, false); //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player_back.png").c_str())); + buf->getMaterial().setTexture(0, driver->getTexture(getTexturePath("player_back.png").c_str())); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; |