aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api/l_craft.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/script/lua_api/l_craft.h
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/lua_api/l_craft.h')
-rw-r--r--src/script/lua_api/l_craft.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/script/lua_api/l_craft.h b/src/script/lua_api/l_craft.h
index 5ba3d18fe..9002b23ef 100644
--- a/src/script/lua_api/l_craft.h
+++ b/src/script/lua_api/l_craft.h
@@ -26,8 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct CraftReplacements;
-class ModApiCraft : public ModApiBase
-{
+class ModApiCraft : public ModApiBase {
private:
static int l_register_craft(lua_State *L);
static int l_get_craft_recipe(lua_State *L);
@@ -35,12 +34,12 @@ private:
static int l_get_craft_result(lua_State *L);
static int l_clear_craft(lua_State *L);
- static bool readCraftReplacements(
- lua_State *L, int index, CraftReplacements &replacements);
- static bool readCraftRecipeShapeless(
- lua_State *L, int index, std::vector<std::string> &recipe);
- static bool readCraftRecipeShaped(lua_State *L, int index, int &width,
+ static bool readCraftReplacements(lua_State *L, int index,
+ CraftReplacements &replacements);
+ static bool readCraftRecipeShapeless(lua_State *L, int index,
std::vector<std::string> &recipe);
+ static bool readCraftRecipeShaped(lua_State *L, int index,
+ int &width, std::vector<std::string> &recipe);
static struct EnumString es_CraftMethod[];