From 0a90fedabc07a3ba811f13ed8d673136e857ec02 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sun, 28 Jun 2015 14:45:47 +0200 Subject: [PATCH] Bugfix: minimap was updated only with loading new blocks, allow forced updates with changing player pos --- src/minimap.cpp | 11 ++++++++++- src/minimap.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/minimap.cpp b/src/minimap.cpp index 9adeb84bc..02660f969 100644 --- 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 index 220c3add0..37bc2f7cb 100644 --- a/src/minimap.h +++ b/src/minimap.h @@ -131,7 +131,7 @@ public: video::SColor getColorFromId(u16 id); void enqueue_Block(v3s16 pos, MinimapMapblock *data); - + void forceUpdate(); IrrlichtDevice *device; Client *client; video::IVideoDriver *driver; -- 2.25.1