diff options
| author | Foghrye4 <foghrye4@gmail.com> | 2016-11-14 18:09:59 +0400 |
|---|---|---|
| committer | Zeno- <kde.psych@gmail.com> | 2016-11-15 00:09:59 +1000 |
| commit | 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef (patch) | |
| tree | 9b9b665b97c01f0b281652a85088b336cc4cefde /src/script/common/c_content.cpp | |
| parent | 649448a2a91fbf3e944b2f2e739f4e2292af1df0 (diff) | |
| download | minetest-93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.tar.gz minetest-93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.tar.bz2 minetest-93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.zip | |
Adding particle blend, glow and animation (#4705)
Diffstat (limited to 'src/script/common/c_content.cpp')
| -rw-r--r-- | src/script/common/c_content.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index f20a65903..d4a25b68b 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -35,10 +35,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "noise.h" #include <json/json.h> -struct EnumString es_TileAnimationType[] = +struct EnumString es_AnimationType[] = { - {TAT_NONE, "none"}, - {TAT_VERTICAL_FRAMES, "vertical_frames"}, + {AT_NONE, "none"}, + {AT_VERTICAL_FRAMES, "vertical_frames"}, + {AT_2D_ANIMATION_SHEET, "2d_animation_sheet"}, {0, NULL}, }; @@ -335,9 +336,9 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype) lua_getfield(L, index, "animation"); if(lua_istable(L, -1)){ // {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0} - tiledef.animation.type = (TileAnimationType) - getenumfield(L, -1, "type", es_TileAnimationType, - TAT_NONE); + tiledef.animation.type = (AnimationType) + getenumfield(L, -1, "type", es_AnimationType, + AT_NONE); tiledef.animation.aspect_w = getintfield_default(L, -1, "aspect_w", 16); tiledef.animation.aspect_h = |