diff options
| author | bigfoot547 <bigfoot547@users.noreply.github.com> | 2017-04-14 02:04:41 -0500 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-14 09:04:41 +0200 |
| commit | e80a83d1cb9d01273ddca1c075c25cd01c291ca7 (patch) | |
| tree | 277bc42c60466ca4e35fd29072c3eae5e6511391 /src/script/lua_api | |
| parent | 6f641df8a52ccb84452a289416527e3d1a36621a (diff) | |
| download | minetest-e80a83d1cb9d01273ddca1c075c25cd01c291ca7.tar.gz minetest-e80a83d1cb9d01273ddca1c075c25cd01c291ca7.tar.bz2 minetest-e80a83d1cb9d01273ddca1c075c25cd01c291ca7.zip | |
[CSM] Add function to set minimap shape (#5569)
* [CSM] Add function to set minimap shape
Also deprecates `toggle_shape`.
* Oh fish, I messed that one up!
* Fix Style
* Sorry, I missed something
I still had the `luamethod` call in there!
* Add getters
* Remove extra line
* Remove useless variable
Please review again @nerzhul . Thanks!
* Satisfy nerzhul
Diffstat (limited to 'src/script/lua_api')
| -rw-r--r-- | src/script/lua_api/l_minimap.cpp | 18 | ||||
| -rw-r--r-- | src/script/lua_api/l_minimap.h | 3 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp index c68602909..f32a07ce8 100644 --- a/src/script/lua_api/l_minimap.cpp +++ b/src/script/lua_api/l_minimap.cpp @@ -108,12 +108,23 @@ int LuaMinimap::l_set_mode(lua_State *L) return 1; } -int LuaMinimap::l_toggle_shape(lua_State *L) +int LuaMinimap::l_set_shape(lua_State *L) +{ + LuaMinimap *ref = checkobject(L, 1); + Minimap *m = getobject(ref); + if (!lua_isnumber(L, 2)) + return 0; + + m->setMinimapShape((MinimapShape)lua_tonumber(L, 2)); + return 0; +} + +int LuaMinimap::l_get_shape(lua_State *L) { LuaMinimap *ref = checkobject(L, 1); Minimap *m = getobject(ref); - m->toggleMinimapShape(); + lua_pushnumber(L, (int)m->getMinimapShape()); return 1; } @@ -210,6 +221,7 @@ const luaL_Reg LuaMinimap::methods[] = { luamethod(LuaMinimap, set_angle), luamethod(LuaMinimap, get_mode), luamethod(LuaMinimap, set_mode), - luamethod(LuaMinimap, toggle_shape), + luamethod(LuaMinimap, set_shape), + luamethod(LuaMinimap, get_shape), {0,0} }; diff --git a/src/script/lua_api/l_minimap.h b/src/script/lua_api/l_minimap.h index 8be72b8e7..ba702b0b1 100644 --- a/src/script/lua_api/l_minimap.h +++ b/src/script/lua_api/l_minimap.h @@ -45,7 +45,8 @@ private: static int l_show(lua_State *L); static int l_hide(lua_State *L); - static int l_toggle_shape(lua_State *L); + static int l_set_shape(lua_State *L); + static int l_get_shape(lua_State *L); Minimap *m_minimap; |