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:44:42 +0100
committerGitHub <noreply@github.com>2020-11-04 16:44:42 +0100
commit5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch)
treec980d614fec4a5495798be3e79e033229062c3cd /src/script/lua_api/l_craft.h
parent28f6a79706b088c37268a59d90878220dc4ef9c7 (diff)
parent3af10766fd2b58b068e970266724d7eb10e9316b (diff)
downloaddragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.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, 7 insertions, 6 deletions
diff --git a/src/script/lua_api/l_craft.h b/src/script/lua_api/l_craft.h
index 9002b23ef..5ba3d18fe 100644
--- a/src/script/lua_api/l_craft.h
+++ b/src/script/lua_api/l_craft.h
@@ -26,7 +26,8 @@ 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);
@@ -34,12 +35,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,
+ 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 bool readCraftRecipeShaped(lua_State *L, int index,
- int &width, std::vector<std::string> &recipe);
static struct EnumString es_CraftMethod[];