Add particle animation, glow

This is implemented by reusing and extending the
TileAnimation code for the methods used by particles.

1 files changed, 25 insertions, 2 deletions

diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index 667ac7272..7f415844a 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_object.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
+#include "common/c_content.h"
 #include "server.h"
 #include "particles.h"
 
@@ -34,6 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
 int ModApiParticles::l_add_particle(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
@@ -47,10 +50,13 @@ int ModApiParticles::l_add_particle(lua_State *L)
 
 	bool collisiondetection, vertical, collision_removal;
 	collisiondetection = vertical = collision_removal = false;
+	struct TileAnimationParams animation;
 
 	std::string texture = "";
 	std::string playername = "";
 
+	u8 glow = 0;
+
 	if (lua_gettop(L) > 1) // deprecated
 	{
 		log_deprecated(L, "Deprecated add_particle call with individual parameters instead of definition");
@@ -101,11 +107,18 @@ int ModApiParticles::l_add_particle(lua_State *L)
 		collision_removal = getboolfield_default(L, 1,
 			"collision_removal", collision_removal);
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
+
+		lua_getfield(L, 1, "animation");
+		animation = read_animation_definition(L, -1);
+		lua_pop(L, 1);
+
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
+
+		glow = getintfield_default(L, 1, "glow", 0);
 	}
 	getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
-			collisiondetection, collision_removal, vertical, texture);
+			collisiondetection, collision_removal, vertical, texture, animation, glow);
 	return 1;
 }
 
@@ -127,6 +140,8 @@ int ModApiParticles::l_add_particle(lua_State *L)
 // collision_removal = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
 int ModApiParticles::l_add_particlespawner(lua_State *L)
 {
 	MAP_LOCK_REQUIRED;
@@ -139,9 +154,11 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 	      time= minexptime= maxexptime= minsize= maxsize= 1;
 	bool collisiondetection, vertical, collision_removal;
 	     collisiondetection = vertical = collision_removal = false;
+	struct TileAnimationParams animation;
 	ServerActiveObject *attached = NULL;
 	std::string texture = "";
 	std::string playername = "";
+	u8 glow = 0;
 
 	if (lua_gettop(L) > 1) //deprecated
 	{
@@ -201,6 +218,10 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		collision_removal = getboolfield_default(L, 1,
 			"collision_removal", collision_removal);
 
+		lua_getfield(L, 1, "animation");
+		animation = read_animation_definition(L, -1);
+		lua_pop(L, 1);
+
 		lua_getfield(L, 1, "attached");
 		if (!lua_isnil(L, -1)) {
 			ObjectRef *ref = ObjectRef::checkobject(L, -1);
@@ -211,6 +232,7 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 		vertical = getboolfield_default(L, 1, "vertical", vertical);
 		texture = getstringfield_default(L, 1, "texture", "");
 		playername = getstringfield_default(L, 1, "playername", "");
+		glow = getintfield_default(L, 1, "glow", 0);
 	}
 
 	u32 id = getServer(L)->addParticleSpawner(amount, time,
@@ -223,7 +245,8 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 			collision_removal,
 			attached,
 			vertical,
-			texture, playername);
+			texture, playername,
+			animation, glow);
 	lua_pushnumber(L, id);
 
 	return 1;