Revert "Make Lint Happy"

[dragonfireclient.git] / src / nodetimer.h

diff --git a/src/nodetimer.h b/src/nodetimer.h
index 4edc38ba864e315c26647ce112a7d41921d4dce0..40e54ccc569221e5e679965423d63ad5a38561ab 100644 (file)
--- a/src/nodetimer.h
+++ b/src/nodetimer.h
@@ -36,11 +36,10 @@ class NodeTimer
 {
 public:
        NodeTimer() = default;
-       NodeTimer(const v3s16 &position_) : position(position_) {}
-       NodeTimer(f32 timeout_, f32 elapsed_, v3s16 position_) :
-                       timeout(timeout_), elapsed(elapsed_), position(position_)
-       {
-       }
+       NodeTimer(const v3s16 &position_):
+               position(position_) {}
+       NodeTimer(f32 timeout_, f32 elapsed_, v3s16 position_):
+               timeout(timeout_), elapsed(elapsed_), position(position_) {}
        ~NodeTimer() = default;
 
        void serialize(std::ostream &os) const;
@@ -65,10 +64,9 @@ class NodeTimerList
        void deSerialize(std::istream &is, u8 map_format_version);
 
        // Get timer
-       NodeTimer get(const v3s16 &p)
-       {
+       NodeTimer get(const v3s16 &p) {
                std::map<v3s16, std::multimap<double, NodeTimer>::iterator>::iterator n =
-                               m_iterators.find(p);
+                       m_iterators.find(p);
                if (n == m_iterators.end())
                        return NodeTimer();
                NodeTimer t = n->second->second;
@@ -76,11 +74,10 @@ class NodeTimerList
                return t;
        }
        // Deletes timer
-       void remove(v3s16 p)
-       {
+       void remove(v3s16 p) {
                std::map<v3s16, std::multimap<double, NodeTimer>::iterator>::iterator n =
-                               m_iterators.find(p);
-               if (n != m_iterators.end()) {
+                       m_iterators.find(p);
+               if(n != m_iterators.end()) {
                        double removed_time = n->second->first;
                        m_timers.erase(n->second);
                        m_iterators.erase(n);
@@ -96,26 +93,25 @@ class NodeTimerList
                }
        }
        // Undefined behaviour if there already is a timer
-       void insert(NodeTimer timer)
-       {
+       void insert(NodeTimer timer) {
                v3s16 p = timer.position;
                double trigger_time = m_time + (double)(timer.timeout - timer.elapsed);
-               std::multimap<double, NodeTimer>::iterator it = m_timers.insert(
-                               std::pair<double, NodeTimer>(trigger_time, timer));
-               m_iterators.insert(std::pair<v3s16,
-                               std::multimap<double, NodeTimer>::iterator>(p, it));
+               std::multimap<double, NodeTimer>::iterator it =
+                       m_timers.insert(std::pair<double, NodeTimer>(
+                               trigger_time, timer
+                       ));
+               m_iterators.insert(
+                       std::pair<v3s16, std::multimap<double, NodeTimer>::iterator>(p, it));
                if (m_next_trigger_time == -1. || trigger_time < m_next_trigger_time)
                        m_next_trigger_time = trigger_time;
        }
        // Deletes old timer and sets a new one
-       inline void set(const NodeTimer &timer)
-       {
+       inline void set(const NodeTimer &timer) {
                remove(timer.position);
                insert(timer);
        }
        // Deletes all timers
-       void clear()
-       {
+       void clear() {
                m_timers.clear();
                m_iterators.clear();
                m_next_trigger_time = -1.;