Fix typo in mapblock.h
authorCraig Robbins <kde.psych@gmail.com>
Fri, 12 Dec 2014 08:06:36 +0000 (18:06 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Fri, 12 Dec 2014 10:46:37 +0000 (20:46 +1000)
src/mapblock.h
src/server.cpp

index fa56f331865385e4e276caba9e98982085059e74..76c82c083c065b520d9ecc73dd6e35f937ed208c 100644 (file)
@@ -424,7 +424,7 @@ public:
        {
                m_usage_timer += dtime;
        }
-       u32 getUsageTimer()
+       float getUsageTimer()
        {
                return m_usage_timer;
        }
index f15ca99620f9bb2162c139b74818a195d1be855f..7c5ee7f4242f40d29cf38ffec96746bfe38b71e9 100644 (file)
@@ -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);