diff options
| author | kwolekr <mirrorisim@gmail.com> | 2013-02-25 20:52:24 -0800 |
|---|---|---|
| committer | kwolekr <mirrorisim@gmail.com> | 2013-02-25 20:52:24 -0800 |
| commit | 979ca23f1eae1adeb8b0083dffe7203c54d87395 (patch) | |
| tree | 689ce00fbfe55861f4df39e1801fc9bc990b141f /src/server.cpp | |
| parent | 9b5f182642416add39aab7782b1d155dafead160 (diff) | |
| parent | b90e431fc785961e7913023999d1f570ad7ca151 (diff) | |
| download | minetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.tar.gz minetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.tar.bz2 minetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.zip | |
Merge pull request #482 from proller/liquid
finite liquid
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp index 5021718a3..2d00cf4ac 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -659,6 +659,7 @@ Server::Server( m_ignore_map_edit_events_peer_id(0) { m_liquid_transform_timer = 0.0; + m_liquid_transform_every = 1.0; m_print_info_timer = 0.0; m_masterserver_timer = 0.0; m_objectdata_timer = 0.0; @@ -834,6 +835,8 @@ Server::Server( Add some test ActiveBlockModifiers to environment */ add_legacy_abms(m_env, m_nodedef); + + m_liquid_transform_every = g_settings->getFloat("liquid_update"); } Server::~Server() @@ -1150,9 +1153,9 @@ void Server::AsyncRunStep() /* Transform liquids */ m_liquid_transform_timer += dtime; - if(m_liquid_transform_timer >= 1.00) + if(m_liquid_transform_timer >= m_liquid_transform_every) { - m_liquid_transform_timer -= 1.00; + m_liquid_transform_timer -= m_liquid_transform_every; JMutexAutoLock lock(m_env_mutex); |