aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/common')
-rw-r--r--src/script/common/c_content.cpp14
-rw-r--r--src/script/common/c_content.h73
-rw-r--r--src/script/common/c_converter.h2
3 files changed, 39 insertions, 50 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 94fcdecbb..4db92190b 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -985,11 +985,11 @@ void read_groups(lua_State *L, int index,
}
/******************************************************************************/
-void push_groups(lua_State *L, std::map<std::string, int> groups)
+void push_groups(lua_State *L, const std::map<std::string, int> &groups)
{
lua_newtable(L);
- for (std::map<std::string, int>::iterator it = groups.begin();
- it != groups.end(); ++it) {
+ std::map<std::string, int>::const_iterator it;
+ for (it = groups.begin(); it != groups.end(); ++it) {
lua_pushnumber(L, it->second);
lua_setfield(L, -2, it->first.c_str());
}
@@ -998,12 +998,10 @@ void push_groups(lua_State *L, std::map<std::string, int> groups)
/******************************************************************************/
void push_items(lua_State *L, const std::vector<ItemStack> &items)
{
- // Create and fill table
lua_createtable(L, items.size(), 0);
- std::vector<ItemStack>::const_iterator iter = items.begin();
- for (u32 i = 0; iter != items.end(); iter++) {
- LuaItemStack::create(L, *iter);
- lua_rawseti(L, -2, ++i);
+ for (u32 i = 0; i != items.size(); i++) {
+ LuaItemStack::create(L, items[i]);
+ lua_rawseti(L, -2, i + 1);
}
}
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 69b2a8355..4547009e7 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -62,61 +62,56 @@ 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);
-void push_object_properties (lua_State *L,
- ObjectProperties *prop);
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);
+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,
+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_);
@@ -129,8 +124,9 @@ bool getflagsfield (lua_State *L, int table,
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);
+
+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);
@@ -146,24 +142,21 @@ void read_soundspec (lua_State *L,
int index,
SimpleSoundSpec &spec);
-
bool string_to_enum (const EnumString *spec,
int &result,
const std::string &str);
bool read_noiseparams (lua_State *L, int index,
NoiseParams *np);
-void push_noiseparams (lua_State *L, 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);
+void read_json_value (lua_State *L, Json::Value &root,
+ int index, u8 recursion = 0);
extern struct EnumString es_TileAnimationType[];
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index 8a49c7a73..18a045d2a 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -104,8 +104,6 @@ void push_ARGB8 (lua_State *L, video::SColor color);
void pushFloatPos (lua_State *L, v3f p);
void push_v3f (lua_State *L, v3f p);
void push_v2f (lua_State *L, v2f p);
-void push_groups (lua_State *L,
- std::map<std::string, int> groups);
void warn_if_field_exists(lua_State *L, int table,
const char *fieldname,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 18:07:11 +0000