From 53bf62bb8391e97d120bbbdb03b18d0bb2e99f03 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 6 Aug 2013 18:17:58 +0300
Subject: [PATCH] Rename LagPool's member variables to avoid MSVC freaking up
due to it's #define max
---
src/content_sao.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/content_sao.h b/src/content_sao.h
index 413fd3e68..de4ac2d39 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -124,30 +124,30 @@ class LuaEntitySAO : public ServerActiveObject
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;
}
};
--
GitLab