From: est31 Date: Sat, 25 Jul 2015 05:54:56 +0000 (+0200) Subject: Fix minetest.get_(all)_craft_recipe(s) regression X-Git-Tag: 0.4.13~81 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa1096ec49ee9b2b8ca85ff272930812e657b3c5;p=oweals%2Fminetest.git Fix minetest.get_(all)_craft_recipe(s) regression Since 03e0dd33a847a83d975282c6caf6b926306e7b57 the calls didn't return an output count for the recipes. --- diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp index f59487727..391a0133d 100644 --- a/src/script/lua_api/l_craft.cpp +++ b/src/script/lua_api/l_craft.cpp @@ -332,7 +332,7 @@ int ModApiCraft::l_get_craft_result(lua_State *L) } -void push_craft_recipe(lua_State *L, IGameDef *gdef, +static void push_craft_recipe(lua_State *L, IGameDef *gdef, const CraftDefinition *recipe, const CraftOutput &tmpout) { @@ -363,11 +363,11 @@ void push_craft_recipe(lua_State *L, IGameDef *gdef, lua_pushstring(L, "unknown"); } lua_setfield(L, -2, "type"); - lua_pushstring(L, tmpout.item.c_str()); + lua_pushstring(L, output.item.c_str()); lua_setfield(L, -2, "output"); } -void push_craft_recipes(lua_State *L, IGameDef *gdef, +static void push_craft_recipes(lua_State *L, IGameDef *gdef, const std::vector &recipes, const CraftOutput &output) {