diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-05-16 12:26:57 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-05-16 20:15:03 -0400 |
| commit | fb36c471d7c35bafec9c70028fbabf4ea4838ad2 (patch) | |
| tree | a873df0cec3baa1342c39593f7977cb1700700f5 /src/script/common/c_converter.h | |
| parent | 8f9af57314f71aae1cc77e13f9996e13015d776d (diff) | |
| download | minetest-fb36c471d7c35bafec9c70028fbabf4ea4838ad2.tar.gz minetest-fb36c471d7c35bafec9c70028fbabf4ea4838ad2.tar.bz2 minetest-fb36c471d7c35bafec9c70028fbabf4ea4838ad2.zip | |
SAPI: Accept either ARGB8 table or ColorString to specify colors
Diffstat (limited to 'src/script/common/c_converter.h')
| -rw-r--r-- | src/script/common/c_converter.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h index ff1fcaadf..e99826404 100644 --- a/src/script/common/c_converter.h +++ b/src/script/common/c_converter.h @@ -76,7 +76,6 @@ void setfloatfield(lua_State *L, int table, void setboolfield(lua_State *L, int table, const char *fieldname, bool value); - v3f checkFloatPos (lua_State *L, int index); v2f check_v2f (lua_State *L, int index); v2s16 check_v2s16 (lua_State *L, int index); @@ -87,7 +86,10 @@ v3f read_v3f (lua_State *L, int index); v2f read_v2f (lua_State *L, int index); v2s16 read_v2s16 (lua_State *L, int index); v2s32 read_v2s32 (lua_State *L, int index); -video::SColor readARGB8 (lua_State *L, int index); +video::SColor read_ARGB8 (lua_State *L, int index); +bool read_color (lua_State *L, int index, + video::SColor *color); + aabb3f read_aabb3f (lua_State *L, int index, f32 scale); v3s16 read_v3s16 (lua_State *L, int index); std::vector<aabb3f> read_aabb3f_vector (lua_State *L, int index, f32 scale); @@ -100,11 +102,8 @@ void pushFloatPos (lua_State *L, v3f p); void push_v3f (lua_State *L, v3f p); void push_v2f (lua_State *L, v2f p); - - -void warn_if_field_exists (lua_State *L, - int table, - const char *fieldname, - const std::string &message); +void warn_if_field_exists(lua_State *L, int table, + const char *fieldname, + const std::string &message); #endif /* C_CONVERTER_H_ */ |