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/nodedef.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/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index c690e6720..39ea1a60e 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -211,7 +211,7 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con { int version = readU8(is); name = deSerializeString(is); - animation.type = (AnimationType)readU8(is); + animation.type = (TileAnimationType)readU8(is); animation.aspect_w = readU16(is); animation.aspect_h = readU16(is); animation.length = readF1000(is); @@ -531,7 +531,7 @@ void ContentFeatures::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, tile->material_flags = 0; if (backface_culling) tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING; - if (tiledef->animation.type == AT_VERTICAL_FRAMES) + if (tiledef->animation.type == TAT_VERTICAL_FRAMES) tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; if (tiledef->tileable_horizontal) tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL; |