diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-05-13 18:06:47 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-05-13 18:06:47 +0200 |
| commit | f3e741dad1311e0b4057b530386e246f921be52c (patch) | |
| tree | 64581e3f0ddfa9d4740eed7b545fe3db87b8c126 /src/client/minimap.cpp | |
| parent | 96a37aed31cfb9c131e46eda80bdbe3d2289a546 (diff) | |
| parent | 69c70dd319532f7860f211f4a527a902b0386e49 (diff) | |
| download | dragonfireclient-f3e741dad1311e0b4057b530386e246f921be52c.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/client/minimap.cpp')
| -rw-r--r-- | src/client/minimap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp index 165fa80bd..3013e1406 100644 --- a/src/client/minimap.cpp +++ b/src/client/minimap.cpp @@ -491,7 +491,8 @@ video::ITexture *Minimap::getMinimapTexture() // Want to use texture source, to : 1 find texture, 2 cache it video::ITexture* texture = m_tsrc->getTexture(data->mode.texture); video::IImage* image = driver->createImageFromData( - texture->getColorFormat(), texture->getSize(), texture->lock(), true, false); + texture->getColorFormat(), texture->getSize(), + texture->lock(video::ETLM_READ_ONLY), true, false); texture->unlock(); auto dim = image->getDimension(); @@ -576,7 +577,7 @@ scene::SMeshBuffer *Minimap::getMinimapMeshBuffer() void Minimap::drawMinimap() { // Non hud managed minimap drawing (legacy minimap) - v2u32 screensize = RenderingEngine::get_instance()->getWindowSize(); + v2u32 screensize = RenderingEngine::getWindowSize(); const u32 size = 0.25 * screensize.Y; drawMinimap(core::rect<s32>( |