1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00

Merge pull request #482 from proller/liquid

finite liquid
This commit is contained in:
kwolekr 2013-02-25 20:52:24 -08:00
commit 979ca23f1e
10 changed files with 384 additions and 8 deletions

View file

@ -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);