Slightly improved version of mystrtok_r

[dragonfireclient.git] / src / farmesh.cpp

diff --git a/src/farmesh.cpp b/src/farmesh.cpp
index 8f91e3a1ab4ddc427cf05a3032acb04e16549d1c..23f3db5f6597d4a263490c12027d90e05f35d691 100644 (file)
--- a/src/farmesh.cpp
+++ b/src/farmesh.cpp
@@ -3,16 +3,16 @@ Part of Minetest-c55
 Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -23,13 +23,16 @@ 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 "clientmap.h"
 
-#include "mapgen.h"
+#include "mapgen.h" // Shouldn't really be done this way
 
 FarMesh::FarMesh(
                scene::ISceneNode* parent,
@@ -47,7 +50,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 +65,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);
 
@@ -118,14 +120,14 @@ HeightPoint ground_height(u64 seed, v2s16 p2d)
        if(n)
                return n->getValue();
        HeightPoint hp;
-       s16 level = mapgen::find_ground_level_from_noise(seed, p2d, 3);
+       s16 level = Mapgen::find_ground_level_from_noise(seed, p2d, 3);
        hp.gh = (level-4)*BS;
        hp.ma = (4)*BS;
        /*hp.gh = BS*base_rock_level_2d(seed, p2d);
        hp.ma = BS*get_mud_add_amount(seed, p2d);*/
-       hp.have_sand = mapgen::get_have_sand(seed, p2d);
+       hp.have_sand = Mapgen::get_have_beach(seed, p2d);
        if(hp.gh > BS*WATER_LEVEL)
-               hp.tree_amount = mapgen::tree_amount_2d(seed, p2d);
+               hp.tree_amount = Mapgen::tree_amount_2d(seed, p2d);
        else
                hp.tree_amount = 0;
        // No mud has been added if mud amount is less than 1