Dont remove grass under unloaded blocks

[minetest.git] / src / tool.h

diff --git a/src/tool.h b/src/tool.h
index 401bb1f53a16f4d0a6ef688814f8b50799ebeb57..18c09dca3b85df3f2fc7ab41e403fa325760ff20 100644 (file)
--- a/src/tool.h
+++ b/src/tool.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-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.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef TOOL_HEADER
 #define TOOL_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include <string>
 #include <iostream>
 #include <map>
@@ -29,12 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct ToolGroupCap
 {
        std::map<int, float> times;
-       float maxwear;
        int maxlevel;
+       int uses;
 
        ToolGroupCap():
-               maxwear(0.05),
-               maxlevel(1)
+               maxlevel(1),
+               uses(20)
        {}
 
        bool getTime(int rating, float *time) const
@@ -82,11 +82,14 @@ struct DigParams
        float time;
        // Caused wear
        u16 wear;
+       std::string main_group;
 
-       DigParams(bool a_diggable=false, float a_time=0, u16 a_wear=0):
+       DigParams(bool a_diggable=false, float a_time=0, u16 a_wear=0,
+                       std::string a_main_group=""):
                diggable(a_diggable),
                time(a_time),
-               wear(a_wear)
+               wear(a_wear),
+               main_group(a_main_group)
        {}
 };
 
@@ -100,10 +103,12 @@ struct HitParams
 {
        s16 hp;
        s16 wear;
+       std::string main_group;
 
-       HitParams(s16 hp_=0, s16 wear_=0):
+       HitParams(s16 hp_=0, s16 wear_=0, std::string main_group_=""):
                hp(hp_),
-               wear(wear_)
+               wear(wear_),
+               main_group(main_group_)
        {}
 };
 
@@ -118,6 +123,7 @@ struct PunchDamageResult
        bool did_punch;
        int damage;
        int wear;
+       std::string main_group;
 
        PunchDamageResult():
                did_punch(false),