diff options
| author | sfan5 <sfan5@live.de> | 2016-11-14 15:28:06 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2016-11-14 15:28:06 +0100 |
| commit | 5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b (patch) | |
| tree | 5008360c4d239d5dfff8eee78b5ea79f69e176dc /src/script/common/c_content.cpp | |
| parent | 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef (diff) | |
| download | minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.gz minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.bz2 minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.zip | |
Revert "Adding particle blend, glow and animation (#4705)"
This reverts commit 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.
Diffstat (limited to 'src/script/common/c_content.cpp')
| -rw-r--r-- | src/script/common/c_content.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index d4a25b68b..f20a65903 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -35,11 +35,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "noise.h" #include <json/json.h> -struct EnumString es_AnimationType[] = +struct EnumString es_TileAnimationType[] = { - {AT_NONE, "none"}, - {AT_VERTICAL_FRAMES, "vertical_frames"}, - {AT_2D_ANIMATION_SHEET, "2d_animation_sheet"}, + {TAT_NONE, "none"}, + {TAT_VERTICAL_FRAMES, "vertical_frames"}, {0, NULL}, }; @@ -336,9 +335,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 = (AnimationType) - getenumfield(L, -1, "type", es_AnimationType, - AT_NONE); + tiledef.animation.type = (TileAnimationType) + getenumfield(L, -1, "type", es_TileAnimationType, + TAT_NONE); tiledef.animation.aspect_w = getintfield_default(L, -1, "aspect_w", 16); tiledef.animation.aspect_h = |