diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 23:33:48 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 23:33:48 +0200 |
commit | af322405454191846507b91251d655c2b0aa864b (patch) | |
tree | 06213c35a56ecbf3ad6e8b509052e1ccd23cb783 /src/materials.h | |
parent | ee0d3bacbce612c1abc6016cb7b0d684df25b820 (diff) | |
download | minetest-af322405454191846507b91251d655c2b0aa864b.tar.gz minetest-af322405454191846507b91251d655c2b0aa864b.tar.bz2 minetest-af322405454191846507b91251d655c2b0aa864b.zip |
Players are more like objects + related stuff
Diffstat (limited to 'src/materials.h')
-rw-r--r-- | src/materials.h | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/src/materials.h b/src/materials.h index bcf930581..b25d047be 100644 --- a/src/materials.h +++ b/src/materials.h @@ -74,30 +74,44 @@ struct MaterialProperties struct DiggingProperties { - DiggingProperties(): - diggable(false), - time(0.0), - wear(0) - { - } - DiggingProperties(bool a_diggable, float a_time, u16 a_wear): - diggable(a_diggable), - time(a_time), - wear(a_wear) - { - } bool diggable; // Digging time in seconds float time; // Caused wear u16 wear; + + DiggingProperties(bool a_diggable=false, float a_time=0, u16 a_wear=0): + diggable(a_diggable), + time(a_time), + wear(a_wear) + {} }; struct ToolDiggingProperties; class INodeDefManager; -DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp, - INodeDefManager *nodemgr); +DiggingProperties getDiggingProperties(const MaterialProperties *mp, + const ToolDiggingProperties *tp, float time_from_last_punch); + +DiggingProperties getDiggingProperties(const MaterialProperties *mp, + const ToolDiggingProperties *tp); + +DiggingProperties getDiggingProperties(u16 content, + const ToolDiggingProperties *tp, INodeDefManager *nodemgr); + +struct HittingProperties +{ + s16 hp; + s16 wear; + + HittingProperties(s16 hp_=0, s16 wear_=0): + hp(hp_), + wear(wear_) + {} +}; + +HittingProperties getHittingProperties(const MaterialProperties *mp, + const ToolDiggingProperties *tp, float time_from_last_punch); #endif |