Fix minetest.get_(all)_craft_recipe(s) regression

est31 · est31 · commit fa1096ec49ee · 2015-07-25T17:33:41.000+02:00
Since 03e0dd3 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
@@ -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<CraftDefinition*> &recipes,
 		const CraftOutput &output)
 {

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ int ModApiCraft::l_get_craft_result(lua_State *L)`
`332`	`332`	`}`
`333`	`333`
`334`	`334`
`335`		`-void push_craft_recipe(lua_State L, IGameDef gdef,`
	`335`	`+static void push_craft_recipe(lua_State L, IGameDef gdef,`
`336`	`336`	`const CraftDefinition *recipe,`
`337`	`337`	`const CraftOutput &tmpout)`
`338`	`338`	`{`
`@@ -363,11 +363,11 @@ void push_craft_recipe(lua_State L, IGameDef gdef,`
`363`	`363`	`lua_pushstring(L, "unknown");`
`364`	`364`	`}`
`365`	`365`	`lua_setfield(L, -2, "type");`
`366`		`- lua_pushstring(L, tmpout.item.c_str());`
	`366`	`+ lua_pushstring(L, output.item.c_str());`
`367`	`367`	`lua_setfield(L, -2, "output");`
`368`	`368`	`}`
`369`	`369`
`370`		`-void push_craft_recipes(lua_State L, IGameDef gdef,`
	`370`	`+static void push_craft_recipes(lua_State L, IGameDef gdef,`
`371`	`371`	`const std::vector<CraftDefinition*> &recipes,`
`372`	`372`	`const CraftOutput &output)`
`373`	`373`	`{`