diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-07-08 23:06:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-08 23:06:33 +0200 |
| commit | a61e1a4dbce39ced7a1da599d87dfcb876613109 (patch) | |
| tree | 6cd5177133cf93773da851fbe233e2088b67661b /src/script/lua_api | |
| parent | 94cd2bfeac073bf0ff0c384e4921c90f281747b0 (diff) | |
| download | minetest-a61e1a4dbce39ced7a1da599d87dfcb876613109.tar.gz minetest-a61e1a4dbce39ced7a1da599d87dfcb876613109.tar.bz2 minetest-a61e1a4dbce39ced7a1da599d87dfcb876613109.zip | |
Lua templating reading (part 4): s16, v2s16, v2f (#7512)
Diffstat (limited to 'src/script/lua_api')
| -rw-r--r-- | src/script/lua_api/l_noise.cpp | 10 | ||||
| -rw-r--r-- | src/script/lua_api/l_object.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp index ac3ddd479..e38d319f4 100644 --- a/src/script/lua_api/l_noise.cpp +++ b/src/script/lua_api/l_noise.cpp @@ -40,7 +40,7 @@ int LuaPerlinNoise::l_get_2d(lua_State *L) { NO_MAP_LOCK_REQUIRED; LuaPerlinNoise *o = checkobject(L, 1); - v2f p = check_v2f(L, 2); + v2f p = readParam<v2f>(L, 2); lua_Number val = NoisePerlin2D(&o->np, p.X, p.Y, 0); lua_pushnumber(L, val); return 1; @@ -166,7 +166,7 @@ int LuaPerlinNoiseMap::l_get_2d_map(lua_State *L) size_t i = 0; LuaPerlinNoiseMap *o = checkobject(L, 1); - v2f p = check_v2f(L, 2); + v2f p = readParam<v2f>(L, 2); Noise *n = o->noise; n->perlinMap2D(p.X, p.Y); @@ -189,8 +189,8 @@ int LuaPerlinNoiseMap::l_get_2d_map_flat(lua_State *L) NO_MAP_LOCK_REQUIRED; LuaPerlinNoiseMap *o = checkobject(L, 1); - v2f p = check_v2f(L, 2); - bool use_buffer = lua_istable(L, 3); + v2f p = readParam<v2f>(L, 2); + bool use_buffer = lua_istable(L, 3); Noise *n = o->noise; n->perlinMap2D(p.X, p.Y); @@ -275,7 +275,7 @@ int LuaPerlinNoiseMap::l_calc_2d_map(lua_State *L) NO_MAP_LOCK_REQUIRED; LuaPerlinNoiseMap *o = checkobject(L, 1); - v2f p = check_v2f(L, 2); + v2f p = readParam<v2f>(L, 2); Noise *n = o->noise; n->perlinMap2D(p.X, p.Y); diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 1ea7d7ff2..14010533e 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -458,7 +458,7 @@ int ObjectRef::l_set_animation(lua_State *L) // Do it v2f frames = v2f(1, 1); if (!lua_isnil(L, 2)) - frames = read_v2f(L, 2); + frames = readParam<v2f>(L, 2); float frame_speed = 15; if (!lua_isnil(L, 3)) frame_speed = lua_tonumber(L, 3); @@ -955,7 +955,7 @@ int ObjectRef::l_set_sprite(lua_State *L) // Do it v2s16 p(0,0); if (!lua_isnil(L, 2)) - p = read_v2s16(L, 2); + p = readParam<v2s16>(L, 2); int num_frames = 1; if (!lua_isnil(L, 3)) num_frames = lua_tonumber(L, 3); |