Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / nodetimer.h

diff --git a/src/nodetimer.h b/src/nodetimer.h
index 0fd43b2a886598cb00a188873718c907e39ca670..e6a8d76085c2f1e0db09154edb700c4cb6a720ca 100644 (file)
--- a/src/nodetimer.h
+++ b/src/nodetimer.h
@@ -36,18 +36,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class NodeTimer
 {
 public:
-       NodeTimer(): timeout(0.), elapsed(0.) {}
+       NodeTimer() {}
        NodeTimer(const v3s16 &position_):
-               timeout(0.), elapsed(0.), position(position_) {}
+               position(position_) {}
        NodeTimer(f32 timeout_, f32 elapsed_, v3s16 position_):
                timeout(timeout_), elapsed(elapsed_), position(position_) {}
        ~NodeTimer() {}
-       
+
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
-       
-       f32 timeout;
-       f32 elapsed;
+
+       f32 timeout = 0.0f;
+       f32 elapsed = 0.0f;
        v3s16 position;
 };
 
@@ -58,12 +58,12 @@ public:
 class NodeTimerList
 {
 public:
-       NodeTimerList(): m_next_trigger_time(-1.), m_time(0.) {}
+       NodeTimerList() {}
        ~NodeTimerList() {}
-       
+
        void serialize(std::ostream &os, u8 map_format_version) const;
        void deSerialize(std::istream &is, u8 map_format_version);
-       
+
        // Get timer
        NodeTimer get(const v3s16 &p) {
                std::map<v3s16, std::multimap<double, NodeTimer>::iterator>::iterator n =
@@ -128,8 +128,8 @@ public:
 private:
        std::multimap<double, NodeTimer> m_timers;
        std::map<v3s16, std::multimap<double, NodeTimer>::iterator> m_iterators;
-       double m_next_trigger_time;
-       double m_time;
+       double m_next_trigger_time = -1.0;
+       double m_time = 0.0;
 };
 
 #endif