diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2013-08-06 18:17:58 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2013-08-06 18:17:58 +0300 |
| commit | 53bf62bb8391e97d120bbbdb03b18d0bb2e99f03 (patch) | |
| tree | 667f0cc30e54fb488e932f849bcf241dbf2d22b8 /src | |
| parent | 61f240946a794423b0a50916c96dbb51054a77d0 (diff) | |
| download | minetest-53bf62bb8391e97d120bbbdb03b18d0bb2e99f03.tar.gz minetest-53bf62bb8391e97d120bbbdb03b18d0bb2e99f03.tar.bz2 minetest-53bf62bb8391e97d120bbbdb03b18d0bb2e99f03.zip | |
Rename LagPool's member variables to avoid MSVC freaking up due to it's #define max
Diffstat (limited to 'src')
| -rw-r--r-- | src/content_sao.h | 22 |
1 files 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 @@ 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; } }; |