Fixed two typo's in commit 615fd498bc

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

diff --git a/src/nodetimer.h b/src/nodetimer.h
index b9598673c2b383b5bc0f0293c1eff851df978e39..c643ab888a94ad7d9e8a28908f19e8663bf3598d 100644 (file)
--- a/src/nodetimer.h
+++ b/src/nodetimer.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODETIMER_HEADER
 #define NODETIMER_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <iostream>
 #include <map>
 
@@ -35,15 +35,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class NodeTimer
 {
 public:
-       NodeTimer(): duration(0.), elapsed(0.) {}
-       NodeTimer(f32 duration_, f32 elapsed_):
-               duration(duration_), elapsed(elapsed_) {}
+       NodeTimer(): timeout(0.), elapsed(0.) {}
+       NodeTimer(f32 timeout_, f32 elapsed_):
+               timeout(timeout_), elapsed(elapsed_) {}
        ~NodeTimer() {}
        
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
        
-       f32 duration;
+       f32 timeout;
        f32 elapsed;
 };
 
@@ -57,8 +57,8 @@ public:
        NodeTimerList() {}
        ~NodeTimerList() {}
        
-       void serialize(std::ostream &os) const;
-       void deSerialize(std::istream &is);
+       void serialize(std::ostream &os, u8 map_format_version) const;
+       void deSerialize(std::istream &is, u8 map_format_version);
        
        // Get timer
        NodeTimer get(v3s16 p){
@@ -81,7 +81,7 @@ public:
        }
 
        // A step in time. Returns map of elapsed timers.
-       std::map<v3s16, f32> step(float dtime);
+       std::map<v3s16, NodeTimer> step(float dtime);
 
 private:
        std::map<v3s16, NodeTimer> m_data;