diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-15 21:00:39 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:44 +0200 |
| commit | ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec (patch) | |
| tree | 434f3a74df5dd382434df5b655fee7843e45e004 /src/farmesh.cpp | |
| parent | 6da8cb00e27106221e013aa6d93965b95e630a18 (diff) | |
| download | minetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.tar.gz minetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.tar.bz2 minetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.zip | |
Clean mapnode.h and fix other files accordingly
Diffstat (limited to 'src/farmesh.cpp')
| -rw-r--r-- | src/farmesh.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/farmesh.cpp b/src/farmesh.cpp index 8f91e3a1a..fdc81057b 100644 --- a/src/farmesh.cpp +++ b/src/farmesh.cpp @@ -23,13 +23,15 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "farmesh.h" + #include "constants.h" #include "debug.h" #include "noise.h" #include "map.h" #include "client.h" +#include "tile.h" // ITextureSource -#include "mapgen.h" +#include "mapgen.h" // Shouldn't really be done this way FarMesh::FarMesh( scene::ISceneNode* parent, @@ -47,7 +49,7 @@ FarMesh::FarMesh( { dstream<<__FUNCTION_NAME<<std::endl; - video::IVideoDriver* driver = mgr->getVideoDriver(); + //video::IVideoDriver* driver = mgr->getVideoDriver(); m_materials[0].setFlag(video::EMF_LIGHTING, false); m_materials[0].setFlag(video::EMF_BACK_FACE_CULLING, true); @@ -62,8 +64,7 @@ FarMesh::FarMesh( m_materials[1].setFlag(video::EMF_BACK_FACE_CULLING, false); m_materials[1].setFlag(video::EMF_BILINEAR_FILTER, false); m_materials[1].setFlag(video::EMF_FOG_ENABLE, false); - m_materials[1].setTexture - (0, driver->getTexture(getTexturePath("treeprop.png").c_str())); + m_materials[1].setTexture(0, client->tsrc()->getTextureRaw("treeprop.png")); m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; m_materials[1].setFlag(video::EMF_FOG_ENABLE, true); |