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/clientobject.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/clientobject.cpp')
| -rw-r--r-- | src/clientobject.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp index 9e4bf757c..402535ffc 100644 --- a/src/clientobject.cpp +++ b/src/clientobject.cpp @@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "constants.h" #include "utility.h" #include "environment.h" +#include "tile.h" /* ClientActiveObject @@ -114,7 +115,7 @@ void TestCAO::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; @@ -237,7 +238,7 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr) //buf->getMaterial().setTexture(0, NULL); // Initialize with the stick texture buf->getMaterial().setTexture - (0, driver->getTexture(porting::getDataPath("stick.png").c_str())); + (0, driver->getTexture(getTexturePath("stick.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; @@ -443,7 +444,7 @@ void RatCAO::addToScene(scene::ISceneManager *smgr) buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); //buf->getMaterial().setTexture(0, NULL); 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; @@ -604,7 +605,7 @@ void Oerkki1CAO::addToScene(scene::ISceneManager *smgr) buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); //buf->getMaterial().setTexture(0, NULL); buf->getMaterial().setTexture - (0, driver->getTexture(porting::getDataPath("oerkki1.png").c_str())); + (0, driver->getTexture(getTexturePath("oerkki1.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; |