Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / script / lua_api / l_rollback.cpp

diff --git a/src/script/lua_api/l_rollback.cpp b/src/script/lua_api/l_rollback.cpp
index 09da123c3f3b592e0fbc9aef83f0eb86a34db4ac..482b0cbf58929774eb11d4e8a95dea74b503cf53 100644 (file)
--- a/src/script/lua_api/l_rollback.cpp
+++ b/src/script/lua_api/l_rollback.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "rollback_interface.h"
 
+
 void push_RollbackNode(lua_State *L, RollbackNode &node)
 {
        lua_createtable(L, 0, 3);
@@ -34,15 +35,14 @@ void push_RollbackNode(lua_State *L, RollbackNode &node)
        lua_setfield(L, -2, "param2");
 }
 
-// rollback_get_node_actions(pos, range, seconds, limit) -> {{actor, pos, time, oldnode,
-// newnode}, ...}
+// rollback_get_node_actions(pos, range, seconds, limit) -> {{actor, pos, time, oldnode, newnode}, ...}
 int ModApiRollback::l_rollback_get_node_actions(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
 
        v3s16 pos = read_v3s16(L, 1);
        int range = luaL_checknumber(L, 2);
-       time_t seconds = (time_t)luaL_checknumber(L, 3);
+       time_t seconds = (time_t) luaL_checknumber(L, 3);
        int limit = luaL_checknumber(L, 4);
        Server *server = getServer(L);
        IRollbackManager *rollback = server->getRollbackManager();
@@ -50,8 +50,7 @@ int ModApiRollback::l_rollback_get_node_actions(lua_State *L)
                return 0;
        }
 
-       std::list<RollbackAction> actions =
-                       rollback->getNodeActors(pos, range, seconds, limit);
+       std::list<RollbackAction> actions = rollback->getNodeActors(pos, range, seconds, limit);
        std::list<RollbackAction>::iterator iter = actions.begin();
 
        lua_createtable(L, actions.size(), 0);
@@ -102,8 +101,8 @@ int ModApiRollback::l_rollback_revert_actions_by(lua_State *L)
        lua_pushboolean(L, success);
        lua_createtable(L, log.size(), 0);
        unsigned long i = 0;
-       for (std::list<std::string>::const_iterator iter = log.begin(); iter != log.end();
-                       ++i, ++iter) {
+       for(std::list<std::string>::const_iterator iter = log.begin();
+                       iter != log.end(); ++i, ++iter) {
                lua_pushnumber(L, i);
                lua_pushstring(L, iter->c_str());
                lua_settable(L, -3);