aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2014-12-12 18:06:36 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-12 20:46:37 +1000
commit9f65fd68194c5f06eac4d8696de518ced192dd3b (patch)
tree9c9a1334afafcddcd7fc50ce192dc2f301b3a27a
parent4e5d17f666c1321aa47fad8d315a73f64ff8ca4b (diff)
downloadminetest-9f65fd68194c5f06eac4d8696de518ced192dd3b.tar.gz
minetest-9f65fd68194c5f06eac4d8696de518ced192dd3b.tar.bz2
minetest-9f65fd68194c5f06eac4d8696de518ced192dd3b.zip
Fix typo in mapblock.h
-rw-r--r--src/mapblock.h2
-rw-r--r--src/server.cpp2
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);