Merge branch 'master' into master

1 files changed, 16 insertions, 18 deletions

diff --git a/src/script/lua_api/l_inventoryaction.h b/src/script/lua_api/l_inventoryaction.h
index a4cc6cbe5..c1a96d010 100644
--- a/src/script/lua_api/l_inventoryaction.h
+++ b/src/script/lua_api/l_inventoryaction.h
@@ -20,46 +20,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventorymanager.h"
 #include "lua_api/l_base.h"
 
-#define GET_MOVE_ACTION                                                                  \
-	LuaInventoryAction *o = checkobject(L, 1);                                       \
-	if (o->m_action->getType() == IAction::Craft)                                    \
-		return 0;                                                                \
+#define GET_MOVE_ACTION \
+	LuaInventoryAction *o = checkobject(L, 1); \
+	if (o->m_action->getType() == IAction::Craft) \
+		return 0; \
 	MoveAction *act = dynamic_cast<MoveAction *>(o->m_action);
 
-class LuaInventoryAction : public ModApiBase
-{
+class LuaInventoryAction : public ModApiBase {
 private:
 	InventoryAction *m_action;
-
-	static void readFullInventoryLocationInto(lua_State *L, InventoryLocation *loc,
-			std::string *list, s16 *index);
-
+	
+	static void readFullInventoryLocationInto(lua_State *L, InventoryLocation *loc, std::string *list, s16 *index);
+	
 	static const char className[];
 	static const luaL_Reg methods[];
-
+	
 	// Exported functions
-
+	
 	// garbage collector
 	static int gc_object(lua_State *L);
 
 	// __tostring metamethod
 	static int mt_tostring(lua_State *L);
-
+	
 	// apply(self)
 	static int l_apply(lua_State *L);
-
+	
 	// from(self, location, list, index)
 	static int l_from(lua_State *L);
-
+	
 	// to(self, location, list, index)
 	static int l_to(lua_State *L);
-
+	
 	// craft(self, location)
 	static int l_craft(lua_State *L);
 
 	// set_count(self, count)
 	static int l_set_count(lua_State *L);
-
+		
 public:
 	LuaInventoryAction(const IAction &type);
 	~LuaInventoryAction();
@@ -69,6 +67,6 @@ public:
 	static int create_object(lua_State *L);
 	// Not callable from Lua
 	static int create(lua_State *L, const IAction &type);
-	static LuaInventoryAction *checkobject(lua_State *L, int narg);
+	static LuaInventoryAction* checkobject(lua_State *L, int narg);
 	static void Register(lua_State *L);
 };