moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-17 23:05:07 -05:00
Code Issues Releases Wiki Activity

Bugfix: minimap was updated only with loading new blocks, allow forced updates with changing player pos

Browse Source
This commit is contained in:
RealBadAngel 2015-06-28 14:45:47 +02:00
parent b160f8dfe7
commit 0a90fedabc
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/minimap.cpp
View File

@ -120,6 +120,10 @@ void MinimapUpdateThread::enqueue_Block(v3s16 pos, MinimapMapblock *data)
m_queue_sem.Post(); m_queue_sem.Post();
} }
void MinimapUpdateThread::forceUpdate()
{
m_queue_sem.Post();
}
void *MinimapUpdateThread::Thread() void *MinimapUpdateThread::Thread()
{ {
@ -323,12 +327,17 @@ void Mapper::setMinimapMode(MinimapMode mode)
data->scan_height = modeDefs[(int)mode * 3 + 1]; data->scan_height = modeDefs[(int)mode * 3 + 1];
data->map_size = modeDefs[(int)mode * 3 + 2]; data->map_size = modeDefs[(int)mode * 3 + 2];
data->mode = mode; data->mode = mode;
m_minimap_update_thread->forceUpdate();
} }
void Mapper::setPos(v3s16 pos) void Mapper::setPos(v3s16 pos)
{ {
JMutexAutoLock lock(m_mutex); JMutexAutoLock lock(m_mutex);
if (pos != data->old_pos) {
data->old_pos = data->pos;
data->pos = pos; data->pos = pos;
m_minimap_update_thread->forceUpdate();
}
} }
video::ITexture *Mapper::getMinimapTexture() video::ITexture *Mapper::getMinimapTexture()

2
src/minimap.h
View File

@ -131,7 +131,7 @@ public:
video::SColor getColorFromId(u16 id); video::SColor getColorFromId(u16 id);
void enqueue_Block(v3s16 pos, MinimapMapblock *data); void enqueue_Block(v3s16 pos, MinimapMapblock *data);
void forceUpdate();
IrrlichtDevice *device; IrrlichtDevice *device;
Client *client; Client *client;
video::IVideoDriver *driver; video::IVideoDriver *driver;