Bugfix: minimap was updated only with loading new blocks, allow force…

…d updates with changing player pos
minetest · Jun 28, 2015 · 0a90fed · 0a90fed
1 parent b160f8d
commit 0a90fed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/minimap.cpp b/src/minimap.cpp
@@ -120,6 +120,10 @@ void MinimapUpdateThread::enqueue_Block(v3s16 pos, MinimapMapblock *data)
 		m_queue_sem.Post();
 }
 
+void MinimapUpdateThread::forceUpdate()
+{
+	m_queue_sem.Post();
+}
 
 void *MinimapUpdateThread::Thread()
 {
@@ -323,12 +327,17 @@ void Mapper::setMinimapMode(MinimapMode mode)
 	data->scan_height = modeDefs[(int)mode * 3 + 1];
 	data->map_size = modeDefs[(int)mode * 3 + 2];
 	data->mode = mode;
+	m_minimap_update_thread->forceUpdate();
 }
 
 void Mapper::setPos(v3s16 pos)
 {
 	JMutexAutoLock lock(m_mutex);
-	data->pos = pos;
+	if (pos != data->old_pos) {
+		data->old_pos = data->pos;
+		data->pos = pos;
+		m_minimap_update_thread->forceUpdate();
+	}
 }
 
 video::ITexture *Mapper::getMinimapTexture()

diff --git a/src/minimap.h b/src/minimap.h
@@ -131,7 +131,7 @@ class MinimapUpdateThread : public JThread
 	video::SColor getColorFromId(u16 id);
 
 	void enqueue_Block(v3s16 pos, MinimapMapblock *data);
-
+	void forceUpdate();
 	IrrlichtDevice *device;
 	Client *client;
 	video::IVideoDriver *driver;