diff --git a/src/items/ItemDef.hpp b/src/items/ItemDef.hpp index 12100fb3..319860e1 100644 --- a/src/items/ItemDef.hpp +++ b/src/items/ItemDef.hpp @@ -38,8 +38,8 @@ struct ItemDef { struct { itemid_t id; - item_funcs_set funcsset {}; blockid_t placingBlock; + item_funcs_set funcsset {}; bool emissive = false; } rt {}; diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 16fbdade..16178662 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -11,12 +11,12 @@ namespace fs = std::filesystem; class ArgsReader { - int argc; - char** argv; - int pos = 0; const char* last = ""; + char** argv; + int argc; + int pos = 0; public: - ArgsReader(int argc, char** argv) : argc(argc), argv(argv) {} + ArgsReader(int argc, char** argv) : argv(argv), argc(argc) {} void skip() { pos++;