Rename LagPool's member variables to avoid MSVC freaking up due to it's #define max
authorPerttu Ahola <celeron55@gmail.com>
Tue, 6 Aug 2013 15:17:58 +0000 (18:17 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 6 Aug 2013 15:17:58 +0000 (18:17 +0300)
src/content_sao.h

index 413fd3e683331864103164533b61eeefa1585ff7..de4ac2d39475d365bbd6f6e3ec34011c9df1ecb2 100644 (file)
@@ -124,30 +124,30 @@ private:
 
 class LagPool
 {
-       float pool;
-       float max;
+       float m_pool;
+       float m_max;
 public:
-       LagPool(): pool(15), max(15)
+       LagPool(): m_pool(15), m_max(15)
        {}
        void setMax(float new_max)
        {
-               max = new_max;
-               if(pool > new_max)
-                       pool = new_max;
+               m_max = new_max;
+               if(m_pool > new_max)
+                       m_pool = new_max;
        }
        void add(float dtime)
        {
-               pool -= dtime;
-               if(pool < 0)
-                       pool = 0;
+               m_pool -= dtime;
+               if(m_pool < 0)
+                       m_pool = 0;
        }
        bool grab(float dtime)
        {
                if(dtime <= 0)
                        return true;
-               if(pool + dtime > max)
+               if(m_pool + dtime > m_max)
                        return false;
-               pool += dtime;
+               m_pool += dtime;
                return true;
        }
 };