Fix typo in mapblock.h

Zeno- · Zeno- · commit 9f65fd68194c · 2014-12-12T20:46:37.000+10:00
diff --git a/src/mapblock.h b/src/mapblock.h
@@ -424,7 +424,7 @@ class MapBlock /*: public NodeContainer*/
 	{
 		m_usage_timer += dtime;
 	}
-	u32 getUsageTimer()
+	float getUsageTimer()
 	{
 		return m_usage_timer;
 	}
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ class MapBlock /: public NodeContainer/`
`424`	`424`	`{`
`425`	`425`	`m_usage_timer += dtime;`
`426`	`426`	`}`
`427`		`- u32 getUsageTimer()`
	`427`	`+ float getUsageTimer()`Has conversations. Original line has conversations.
`428`	`428`	`{`
`429`	`429`	`return m_usage_timer;`
`430`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ void Server::AsyncRunStep(bool initial_step)`
`568`	`568`	`m_env->step(dtime);`
`569`	`569`	`}`
`570`	`570`
`571`		`- const float map_timer_and_unload_dtime = 2.92;`
	`571`	`+ static const float map_timer_and_unload_dtime = 2.92;`
`572`	`572`	`if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime))`
`573`	`573`	`{`
`574`	`574`	`JMutexAutoLock lock(m_env_mutex);`