oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Cpp11 patchset 11: continue working on constructor style migration (#6004)

Browse source
This commit is contained in:
Loïc Blot 2017-06-18 19:55:15 +02:00 • committed by GitHub
parent 8f7785771b
commit 4faaadc8d5
39 changed files with 200 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/nodetimer.h
View file

@ -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