luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 09:25:37 +02:00
Code Activity

Lua templating reading (part 4): s16, v2s16, v2f (#7512)

Browse Source
This commit is contained in:
Loïc Blot
2018-07-08 23:06:33 +02:00
committed by GitHub
parent 94cd2bfeac
commit a61e1a4dbc
5 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/lua_api/l_object.cpp
View File

@@ -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);