oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Revert "Adding particle blend, glow and animation (#4705)"

Browse source 
This reverts commit 93e3555eae.
This commit is contained in:
sfan5 2016-11-14 15:28:06 +01:00
parent 93e3555eae
commit 5fd1ef9b58
15 changed files with 81 additions and 800 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/script/common/c_content.cpp
View file

@ -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 =