summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-03-16 10:34:54 +0100
committerGitHub <noreply@github.com>2017-03-16 10:34:54 +0100
commit40ce538aad9af8f7634c4ba7e9f12246fb23b31c (patch)
treeda8788a581acbc18bb9f5e35a2be620ba0125471 /src/game.cpp
parenteb88e5dd4b181a90b382c036cf6c4f42e63e8cc2 (diff)
downloadminetest-40ce538aad9af8f7634c4ba7e9f12246fb23b31c.tar.gz
minetest-40ce538aad9af8f7634c4ba7e9f12246fb23b31c.tar.bz2
minetest-40ce538aad9af8f7634c4ba7e9f12246fb23b31c.zip
[CSM] Add minimap API modifiers (#5399)
* Rename Mapper (too generic) to Minimap * Add lua functions to get/set position, angle, mode for minimap * Client: rename m_mapper to m_minimap * Add minimap to core.ui namespace (core.ui.minimap) * Add various functions to manage minimap (show, hide, toggle_shape) * Cleanup trivial declaration in client
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 10ec5d594..386267017 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -715,7 +715,7 @@ public:
m_eye_position_vertex.set(eye_position_array, services);
float minimap_yaw_array[3];
- v3f minimap_yaw = m_client->getMapper()->getYawVec();
+ v3f minimap_yaw = m_client->getMinimap()->getYawVec();
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
minimap_yaw_array[0] = minimap_yaw.X;
minimap_yaw_array[1] = minimap_yaw.Y;
@@ -1473,7 +1473,7 @@ private:
Sky *sky; // Free using ->Drop()
Inventory *local_inventory;
Hud *hud;
- Mapper *mapper;
+ Minimap *mapper;
GameRunData runData;
VolatileRunFlags flags;
@@ -1769,7 +1769,7 @@ void Game::run()
updateProfilerGraphs(&graph);
// Update if minimap has been disabled by the server
- flags.show_minimap &= !client->isMinimapDisabledByServer();
+ flags.show_minimap = client->shouldShowMinimap();
}
}
@@ -2029,7 +2029,7 @@ bool Game::createClient(const std::string &playername,
return false;
}
- mapper = client->getMapper();
+ mapper = client->getMinimap();
mapper->setMinimapMode(MINIMAP_MODE_OFF);
return true;