Fix code style from recent commits and add misc. optimizations

[dragonfireclient.git] / src / script / common / c_content.h

diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 251a72e27b3b0f62fe9585c5dc08649180ee7ce8..4547009e7c549a8eaa3f991e7610edd1d0883c13 100644 (file)
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -39,87 +39,97 @@ extern "C" {
 #include "irrlichttypes_bloated.h"
 #include "util/string.h"
 
-class MapNode;
+namespace Json { class Value; }
+
+struct MapNode;
 class INodeDefManager;
-class PointedThing;
-class ItemStack;
-class ItemDefinition;
-class ToolCapabilities;
-class ObjectProperties;
-class SimpleSoundSpec;
-class ServerSoundParams;
+struct PointedThing;
+struct ItemStack;
+struct ItemDefinition;
+struct ToolCapabilities;
+struct ObjectProperties;
+struct SimpleSoundSpec;
+struct ServerSoundParams;
 class Inventory;
-class NodeBox;
-class ContentFeatures;
-class TileDef;
+struct NodeBox;
+struct ContentFeatures;
+struct TileDef;
 class Server;
 struct DigParams;
 struct HitParams;
 struct EnumString;
 struct NoiseParams;
+class Schematic;
 
 
-ContentFeatures    read_content_features         (lua_State *L, int index);
-TileDef            read_tiledef                  (lua_State *L, int index);
-void               read_soundspec                (lua_State *L, int index,
-                                                  SimpleSoundSpec &spec);
-NodeBox            read_nodebox                  (lua_State *L, int index);
+ContentFeatures    read_content_features     (lua_State *L, int index);
+TileDef            read_tiledef              (lua_State *L, int index);
+void               read_soundspec            (lua_State *L, int index,
+                                              SimpleSoundSpec &spec);
+NodeBox            read_nodebox              (lua_State *L, int index);
 
-void               read_server_sound_params      (lua_State *L, int index,
-                                                  ServerSoundParams &params);
+void               read_server_sound_params  (lua_State *L, int index,
+                                              ServerSoundParams &params);
 
-void          push_dig_params           (lua_State *L,const DigParams &params);
-void          push_hit_params           (lua_State *L,const HitParams &params);
+void               push_dig_params           (lua_State *L,
+                                              const DigParams &params);
+void               push_hit_params           (lua_State *L,
+                                              const HitParams &params);
 
-ItemStack     read_item                 (lua_State *L, int index, Server* srv);
+ItemStack          read_item                 (lua_State *L, int index, Server *srv);
 
 
-ToolCapabilities   read_tool_capabilities    (lua_State *L,
-                                              int table);
+ToolCapabilities   read_tool_capabilities    (lua_State *L, int table);
 void               push_tool_capabilities    (lua_State *L,
                                               const ToolCapabilities &prop);
 
-ItemDefinition     read_item_definition      (lua_State *L,
-                                              int index,
+ItemDefinition     read_item_definition      (lua_State *L, int index,
                                               ItemDefinition default_def);
-void               read_object_properties    (lua_State *L,
-                                              int index,
+void               read_object_properties    (lua_State *L, int index,
+                                              ObjectProperties *prop);
+void               push_object_properties    (lua_State *L,
                                               ObjectProperties *prop);
 
-//TODO fix parameter oreder!
-void               push_inventory_list       (Inventory *inv,
-                                              const char *name,
-                                              lua_State *L);
-void               read_inventory_list       (Inventory *inv,
-                                              const char *name,
-                                              lua_State *L,
-                                              int tableindex,
-                                              Server* srv,
-                                              int forcesize=-1);
-
-MapNode            readnode                  (lua_State *L,
-                                              int index,
+void               push_inventory_list       (lua_State *L,
+                                              Inventory *inv,
+                                              const char *name);
+void               read_inventory_list       (lua_State *L, int tableindex,
+                                              Inventory *inv, const char *name,
+                                              Server *srv, int forcesize=-1);
+
+MapNode            readnode                  (lua_State *L, int index,
                                               INodeDefManager *ndef);
-void               pushnode                  (lua_State *L,
-                                              const MapNode &n,
+void               pushnode                  (lua_State *L, const MapNode &n,
                                               INodeDefManager *ndef);
 
 NodeBox            read_nodebox              (lua_State *L, int index);
 
-void               read_groups               (lua_State *L,
-                                              int index,
+void               read_groups               (lua_State *L, int index,
                                               std::map<std::string, int> &result);
 
+void               push_groups               (lua_State *L,
+                                              const std::map<std::string, int> &groups);
+
 //TODO rename to "read_enum_field"
-int                getenumfield              (lua_State *L,
-                                              int table,
+int                getenumfield              (lua_State *L, int table,
                                               const char *fieldname,
                                               const EnumString *spec,
                                               int default_);
 
-u32                getflagsfield             (lua_State *L, int table,
+bool               getflagsfield             (lua_State *L, int table,
                                               const char *fieldname,
-                                              FlagDesc *flagdesc);
+                                              FlagDesc *flagdesc,
+                                              u32 *flags, u32 *flagmask);
+
+bool               read_flags                (lua_State *L, int index,
+                                              FlagDesc *flagdesc,
+                                              u32 *flags, u32 *flagmask);
+
+void               push_flags_string         (lua_State *L, FlagDesc *flagdesc,
+                                              u32 flags, u32 flagmask);
+
+u32                read_flags_table          (lua_State *L, int table,
+                                              FlagDesc *flagdesc, u32 *flagmask);
 
 void               push_items                (lua_State *L,
                                               const std::vector<ItemStack> &items);
@@ -132,15 +142,22 @@ void               read_soundspec            (lua_State *L,
                                               int index,
                                               SimpleSoundSpec &spec);
 
-
 bool               string_to_enum            (const EnumString *spec,
                                               int &result,
                                               const std::string &str);
 
-NoiseParams*       read_noiseparams          (lua_State *L, int index);
+bool               read_noiseparams          (lua_State *L, int index,
+                                              NoiseParams *np);
+void               push_noiseparams          (lua_State *L, NoiseParams *np);
 
 void               luaentity_get             (lua_State *L,u16 id);
 
+bool               push_json_value           (lua_State *L,
+                                              const Json::Value &value,
+                                              int nullindex);
+void               read_json_value           (lua_State *L, Json::Value &root,
+                                              int index, u8 recursion = 0);
+
 extern struct EnumString es_TileAnimationType[];
 
 #endif /* C_CONTENT_H_ */