From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 6 Aug 2013 15:17:58 +0000 (+0300)
Subject: Rename LagPool's member variables to avoid MSVC freaking up due to it's #define max
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=53bf62bb8391e97d120bbbdb03b18d0bb2e99f03;p=zefram%2Fminetest%2Fminetest_engine.git

Rename LagPool's member variables to avoid MSVC freaking up due to it's #define max
---

diff --git a/src/content_sao.h b/src/content_sao.h
index 413fd3e6..de4ac2d3 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -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;
 	}
 };