aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-03-19 13:18:52 +0100
committerGitHub <noreply@github.com>2017-03-19 13:18:52 +0100
commit3c4ac70348db5375118d1e714a6d4681c3cfcd05 (patch)
tree351f00d7c980d4c2668d67d5b04fee9f09f9fe5d /src/script/lua_api
parent2e3778ec0c1f77007d064d15310fa816e2a07e88 (diff)
downloadminetest-3c4ac70348db5375118d1e714a6d4681c3cfcd05.tar.gz
minetest-3c4ac70348db5375118d1e714a6d4681c3cfcd05.tar.bz2
minetest-3c4ac70348db5375118d1e714a6d4681c3cfcd05.zip
Refactor Game class (part 2) (#5422)
* showPauseMenu is now part of game * remove many flags parameters passed to game functions, use the member. * rename VolatileRunFlags to GameUIFlags (this will permit to share structure with client and CSM * updatePointedThing: remove pointer ref, we already have the pointer in rundata * move some attributes outside of VolatileRunFlags after renaming, to game class * rename statustext to m_statustext * make some const variables static * All those changes permit to reduce a little bit function class cost and will permit to interface CSM with some interesting Game flags * Expose GameUIFlags to client * Client now have GameUIFlags parameter and setters for other classes * Fix minimap show/hide in Lua because we now have access to the real flag
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_minimap.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
index cb0245576..8e03936a7 100644
--- a/src/script/lua_api/l_minimap.cpp
+++ b/src/script/lua_api/l_minimap.cpp
@@ -118,21 +118,31 @@ int LuaMinimap::l_toggle_shape(lua_State *L)
int LuaMinimap::l_show(lua_State *L)
{
+ Client *client = getClient(L);
+ assert(client);
+
LuaMinimap *ref = checkobject(L, 1);
Minimap *m = getobject(ref);
if (m->getMinimapMode() == MINIMAP_MODE_OFF)
m->setMinimapMode(MINIMAP_MODE_SURFACEx1);
+
+ client->showMinimap(true);
return 1;
}
int LuaMinimap::l_hide(lua_State *L)
{
+ Client *client = getClient(L);
+ assert(client);
+
LuaMinimap *ref = checkobject(L, 1);
Minimap *m = getobject(ref);
if (m->getMinimapMode() != MINIMAP_MODE_OFF)
m->setMinimapMode(MINIMAP_MODE_OFF);
+
+ client->showMinimap(false);
return 1;
}