minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Perttu Ahola 2013-08-06 18:17:58 +03:00
parent 61f240946a
commit 53bf62bb83
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/content_sao.h
View File

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