From: nanoproject <eldorian@email.cz>
Date: Fri, 18 May 2018 20:45:14 +0000 (+0200)
Subject: Player marker on both minimaps (#7350)
X-Git-Tag: 5.0.0~403
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8295f9f89b7e800fe39c2bc9b5638b1fed2c30d8;p=oweals%2Fminetest.git

Player marker on both minimaps (#7350)
---

diff --git a/src/minimap.cpp b/src/minimap.cpp
index 98bb7d9c3..4d83c088a 100644
--- a/src/minimap.cpp
+++ b/src/minimap.cpp
@@ -511,16 +511,18 @@ void Minimap::drawMinimap()
 	driver->setMaterial(material);
 	driver->drawMeshBuffer(m_meshbuffer);
 
-	// If round minimap, draw player marker
-	if (!data->minimap_shape_round) {
+	// Draw player marker on minimap
+	if (data->minimap_shape_round) {
+		matrix.setRotationDegrees(core::vector3df(0, 0, 0));
+	} else {
 		matrix.setRotationDegrees(core::vector3df(0, 0, m_angle));
-		material.TextureLayer[0].Texture = data->player_marker;
-
-		driver->setTransform(video::ETS_WORLD, matrix);
-		driver->setMaterial(material);
-		driver->drawMeshBuffer(m_meshbuffer);
 	}
 
+	material.TextureLayer[0].Texture = data->player_marker;
+	driver->setTransform(video::ETS_WORLD, matrix);
+	driver->setMaterial(material);
+	driver->drawMeshBuffer(m_meshbuffer);
+
 	// Reset transformations
 	driver->setTransform(video::ETS_VIEW, oldViewMat);
 	driver->setTransform(video::ETS_PROJECTION, oldProjMat);