aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api/l_particles.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
commit6ccb5835ff55d85156be91473c598eca9d6cb9a6 (patch)
tree7f1eaf8b94694c8e24e206909ba8f55a1ebfbb3e /src/script/lua_api/l_particles.cpp
parent244713971a976e43e8740b6a9d9d122e37020ef2 (diff)
downloaddragonfireclient-6ccb5835ff55d85156be91473c598eca9d6cb9a6.tar.xz
Revert "Make Lint Happy"
This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
Diffstat (limited to 'src/script/lua_api/l_particles.cpp')
-rw-r--r--src/script/lua_api/l_particles.cpp47
1 files changed, 26 insertions, 21 deletions
diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index ea0a7c796..a51c4fe20 100644
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -49,7 +49,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
if (lua_gettop(L) > 1) // deprecated
{
log_deprecated(L, "Deprecated add_particle call with "
- "individual parameters instead of definition");
+ "individual parameters instead of definition");
p.pos = check_v3f(L, 1);
p.vel = check_v3f(L, 2);
p.acc = check_v3f(L, 3);
@@ -59,7 +59,9 @@ int ModApiParticles::l_add_particle(lua_State *L)
p.texture = luaL_checkstring(L, 7);
if (lua_gettop(L) == 8) // only spawn for a single player
playername = luaL_checkstring(L, 8);
- } else if (lua_istable(L, 1)) {
+ }
+ else if (lua_istable(L, 1))
+ {
lua_getfield(L, 1, "pos");
if (lua_istable(L, -1))
p.pos = check_v3f(L, -1);
@@ -69,7 +71,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
if (lua_istable(L, -1)) {
p.vel = check_v3f(L, -1);
log_deprecated(L, "The use of vel is deprecated. "
- "Use velocity instead");
+ "Use velocity instead");
}
lua_pop(L, 1);
@@ -82,7 +84,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
if (lua_istable(L, -1)) {
p.acc = check_v3f(L, -1);
log_deprecated(L, "The use of acc is deprecated. "
- "Use acceleration instead");
+ "Use acceleration instead");
}
lua_pop(L, 1);
@@ -91,15 +93,15 @@ int ModApiParticles::l_add_particle(lua_State *L)
p.acc = check_v3f(L, -1);
lua_pop(L, 1);
- p.expirationtime = getfloatfield_default(
- L, 1, "expirationtime", p.expirationtime);
+ p.expirationtime = getfloatfield_default(L, 1, "expirationtime",
+ p.expirationtime);
p.size = getfloatfield_default(L, 1, "size", p.size);
- p.collisiondetection = getboolfield_default(
- L, 1, "collisiondetection", p.collisiondetection);
- p.collision_removal = getboolfield_default(
- L, 1, "collision_removal", p.collision_removal);
- p.object_collision = getboolfield_default(
- L, 1, "object_collision", p.object_collision);
+ p.collisiondetection = getboolfield_default(L, 1,
+ "collisiondetection", p.collisiondetection);
+ p.collision_removal = getboolfield_default(L, 1,
+ "collision_removal", p.collision_removal);
+ p.object_collision = getboolfield_default(L, 1,
+ "object_collision", p.object_collision);
p.vertical = getboolfield_default(L, 1, "vertical", p.vertical);
lua_getfield(L, 1, "animation");
@@ -154,10 +156,10 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
ServerActiveObject *attached = NULL;
std::string playername;
- if (lua_gettop(L) > 1) // deprecated
+ if (lua_gettop(L) > 1) //deprecated
{
log_deprecated(L, "Deprecated add_particlespawner call with "
- "individual parameters instead of definition");
+ "individual parameters instead of definition");
p.amount = luaL_checknumber(L, 1);
p.time = luaL_checknumber(L, 2);
p.minpos = check_v3f(L, 3);
@@ -174,7 +176,9 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
p.texture = luaL_checkstring(L, 14);
if (lua_gettop(L) == 15) // only spawn for a single player
playername = luaL_checkstring(L, 15);
- } else if (lua_istable(L, 1)) {
+ }
+ else if (lua_istable(L, 1))
+ {
p.amount = getintfield_default(L, 1, "amount", p.amount);
p.time = getfloatfield_default(L, 1, "time", p.time);
@@ -212,12 +216,12 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
p.maxexptime = getfloatfield_default(L, 1, "maxexptime", p.maxexptime);
p.minsize = getfloatfield_default(L, 1, "minsize", p.minsize);
p.maxsize = getfloatfield_default(L, 1, "maxsize", p.maxsize);
- p.collisiondetection = getboolfield_default(
- L, 1, "collisiondetection", p.collisiondetection);
- p.collision_removal = getboolfield_default(
- L, 1, "collision_removal", p.collision_removal);
- p.object_collision = getboolfield_default(
- L, 1, "object_collision", p.object_collision);
+ p.collisiondetection = getboolfield_default(L, 1,
+ "collisiondetection", p.collisiondetection);
+ p.collision_removal = getboolfield_default(L, 1,
+ "collision_removal", p.collision_removal);
+ p.object_collision = getboolfield_default(L, 1,
+ "object_collision", p.object_collision);
lua_getfield(L, 1, "animation");
p.animation = read_animation_definition(L, -1);
@@ -272,3 +276,4 @@ void ModApiParticles::Initialize(lua_State *L, int top)
API_FCT(add_particlespawner);
API_FCT(delete_particlespawner);
}
+