diff options
Diffstat (limited to 'src/nodetimer.cpp')
| -rw-r--r-- | src/nodetimer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nodetimer.cpp b/src/nodetimer.cpp index ec8611a01..e0c5194fe 100644 --- a/src/nodetimer.cpp +++ b/src/nodetimer.cpp @@ -63,7 +63,7 @@ void NodeTimerList::serialize(std::ostream &os, u8 map_format_version) const for (const auto &timer : m_timers) { NodeTimer t = timer.second; NodeTimer nt = NodeTimer(t.timeout, - t.timeout - (f32)(timer.first - m_time), t.position); + t.timeout - (f32)(timer.first - m_time), t.position); v3s16 p = t.position; u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X; @@ -78,15 +78,15 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version) if (map_format_version == 24) { u8 timer_version = readU8(is); - if(timer_version == 0) + if (timer_version == 0) return; - if(timer_version != 1) + if (timer_version != 1) throw SerializationError("unsupported NodeTimerList version"); } if (map_format_version >= 25) { u8 timer_data_len = readU8(is); - if(timer_data_len != 2+4+4) + if (timer_data_len != 2 + 4 + 4) throw SerializationError("unsupported NodeTimer data length"); } @@ -106,18 +106,18 @@ void NodeTimerList::deSerialize(std::istream &is, u8 map_format_version) t.deSerialize(is); if (t.timeout <= 0) { - warningstream<<"NodeTimerList::deSerialize(): " - <<"invalid data at position" - <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring." - <<std::endl; + warningstream << "NodeTimerList::deSerialize(): " + << "invalid data at position" + << "(" << p.X << "," << p.Y << "," << p.Z + << "): Ignoring." << std::endl; continue; } if (m_iterators.find(p) != m_iterators.end()) { - warningstream<<"NodeTimerList::deSerialize(): " - <<"already set data at position" - <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring." - <<std::endl; + warningstream << "NodeTimerList::deSerialize(): " + << "already set data at position" + << "(" << p.X << "," << p.Y << "," << p.Z + << "): Ignoring." << std::endl; continue; } |