From 9f65fd68194c5f06eac4d8696de518ced192dd3b Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Fri, 12 Dec 2014 18:06:36 +1000 Subject: [PATCH] Fix typo in mapblock.h --- src/mapblock.h | 2 +- src/server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapblock.h b/src/mapblock.h index fa56f3318..76c82c083 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -424,7 +424,7 @@ public: { m_usage_timer += dtime; } - u32 getUsageTimer() + float getUsageTimer() { return m_usage_timer; } diff --git a/src/server.cpp b/src/server.cpp index f15ca9962..7c5ee7f42 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -568,7 +568,7 @@ void Server::AsyncRunStep(bool initial_step) m_env->step(dtime); } - const float map_timer_and_unload_dtime = 2.92; + static const float map_timer_and_unload_dtime = 2.92; if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) { JMutexAutoLock lock(m_env_mutex);