Random Lua tweaks/fixes

[minetest.git] / src / materials.cpp

diff --git a/src/materials.cpp b/src/materials.cpp
index 72547faceaf5e45ffa4f419578fe79b3ebf8766a..ed0b00925ef5edfd2911aa70a8ba0ef45f8662c7 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -27,10 +27,12 @@ void MaterialProperties::serialize(std::ostream &os)
 {
        writeU8(os, 0); // version
        writeU8(os, diggability);
+       writeF1000(os, constant_time);
        writeF1000(os, weight);
        writeF1000(os, crackiness);
        writeF1000(os, crumbliness);
        writeF1000(os, cuttability);
+       writeF1000(os, flammability);
 }
 
 void MaterialProperties::deSerialize(std::istream &is)
@@ -39,10 +41,12 @@ void MaterialProperties::deSerialize(std::istream &is)
        if(version != 0)
                throw SerializationError("unsupported MaterialProperties version");
        diggability = (enum Diggability)readU8(is);
+       constant_time = readF1000(is);
        weight = readF1000(is);
        crackiness = readF1000(is);
        crumbliness = readF1000(is);
        cuttability = readF1000(is);
+       flammability = readF1000(is);
 }
 
 DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp,
@@ -72,7 +76,7 @@ DiggingProperties getDiggingProperties(u16 content, ToolDiggingProperties *tp,
                durability = 1;
 
        float wear = 1.0 / durability;
-       u16 wear_i = wear/65535.;
+       u16 wear_i = 65535.*wear;
        return DiggingProperties(true, time, wear_i);
 }