oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

Code style fixes.

Browse source
This commit is contained in:
SFENCE 2024-09-04 19:15:39 +02:00 • committed by sfence
parent 24e9db07ec
commit af3f696423
43 changed files with 493 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/script/common/c_content.cpp
View file

@ -902,7 +902,7 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
lua_getfield(L, index, "selection_box");
if(lua_istable(L, -1))
f.selection_box = read_nodebox(L, -1);
lua_pop(L, 1);
lua_pop(L, 1);
lua_getfield(L, index, "collision_box");
if(lua_istable(L, -1))

160
src/script/common/c_content.h
View file

@ -62,130 +62,98 @@ extern struct EnumString es_TileAnimationType[];
extern const std::array<const char *, 33> object_property_keys;
void read_content_features (lua_State *L, ContentFeatures &f,
int index);
void push_content_features (lua_State *L,
const ContentFeatures &c);
void read_content_features(lua_State *L, ContentFeatures &f, int index);
void push_content_features(lua_State *L, const ContentFeatures &c);
void push_nodebox (lua_State *L,
const NodeBox &box);
void push_palette (lua_State *L,
const std::vector<video::SColor> *palette);
void push_nodebox(lua_State *L, const NodeBox &box);
void push_palette(lua_State *L, const std::vector<video::SColor> *palette);
TileDef read_tiledef (lua_State *L, int index,
u8 drawtype, bool special);
TileDef read_tiledef(lua_State *L, int index, u8 drawtype, bool special);
void read_simplesoundspec (lua_State *L, int index,
SoundSpec &spec);
NodeBox read_nodebox (lua_State *L, int index);
void read_simplesoundspec(lua_State *L, int index, SoundSpec &spec);
NodeBox read_nodebox(lua_State *L, int index);
void read_server_sound_params (lua_State *L, int index,
ServerPlayingSound &params);
void read_server_sound_params(lua_State *L, int index,
ServerPlayingSound &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, IItemDefManager *idef);
ItemStack read_item(lua_State *L, int index, IItemDefManager *idef);
struct TileAnimationParams read_animation_definition(lua_State *L, int index);
PointabilityType read_pointability_type (lua_State *L, int index);
Pointabilities read_pointabilities (lua_State *L, int index);
void push_pointability_type (lua_State *L, PointabilityType pointable);
void push_pointabilities (lua_State *L, const Pointabilities &pointabilities);
PointabilityType read_pointability_type(lua_State *L, int index);
Pointabilities read_pointabilities(lua_State *L, int index);
void push_pointability_type(lua_State *L, PointabilityType pointable);
void push_pointabilities(lua_State *L, const Pointabilities &pointabilities);
ToolCapabilities read_tool_capabilities (lua_State *L, int table);
void push_tool_capabilities (lua_State *L,
const ToolCapabilities &prop);
WearBarParams read_wear_bar_params (lua_State *L, int table);
void push_wear_bar_params (lua_State *L,
const WearBarParams &prop);
ToolCapabilities read_tool_capabilities(lua_State *L, int table);
void push_tool_capabilities(lua_State *L, const ToolCapabilities &prop);
WearBarParams read_wear_bar_params(lua_State *L, int table);
void push_wear_bar_params(lua_State *L, const WearBarParams &prop);
void read_item_definition (lua_State *L, int index, const ItemDefinition &default_def,
ItemDefinition &def);
void push_item_definition (lua_State *L,
const ItemDefinition &i);
void push_item_definition_full (lua_State *L,
const ItemDefinition &i);
void read_item_definition(lua_State *L, int index,
const ItemDefinition &default_def, ItemDefinition &def);
void push_item_definition(lua_State *L, const ItemDefinition &i);
void push_item_definition_full(lua_State *L, const ItemDefinition &i);
void read_object_properties (lua_State *L, int index,
ServerActiveObject *sao,
ObjectProperties *prop,
IItemDefManager *idef);
void read_object_properties(lua_State *L, int index,
ServerActiveObject *sao,
ObjectProperties *prop,
IItemDefManager *idef);
void push_object_properties (lua_State *L,
const ObjectProperties *prop);
void push_object_properties(lua_State *L, const ObjectProperties *prop);
void push_inventory_list (lua_State *L,
const InventoryList &invlist);
void push_inventory_lists (lua_State *L,
const Inventory &inv);
void read_inventory_list (lua_State *L, int tableindex,
Inventory *inv, const char *name,
IGameDef *gdef, int forcesize=-1);
void push_inventory_list(lua_State *L, const InventoryList &invlist);
void push_inventory_lists(lua_State *L, const Inventory &inv);
void read_inventory_list(lua_State *L, int tableindex,
Inventory *inv, const char *name,
IGameDef *gdef, int forcesize=-1);
MapNode readnode (lua_State *L, int index);
void pushnode (lua_State *L, const MapNode &n);
MapNode readnode(lua_State *L, int index);
void pushnode(lua_State *L, const MapNode &n);
void read_groups (lua_State *L, int index,
ItemGroupList &result);
void read_groups(lua_State *L, int index, ItemGroupList &result);
void push_groups (lua_State *L,
const ItemGroupList &groups);
void push_groups(lua_State *L, const ItemGroupList &groups);
//TODO rename to "read_enum_field"
int getenumfield (lua_State *L, int table,
const char *fieldname,
const EnumString *spec,
int default_);
int getenumfield(lua_State *L, int table, const char *fieldname,
const EnumString *spec, int default_);
bool getflagsfield (lua_State *L, int table,
const char *fieldname,
FlagDesc *flagdesc,
u32 *flags, u32 *flagmask);
bool getflagsfield(lua_State *L, int table, const char *fieldname,
FlagDesc *flagdesc, u32 *flags, u32 *flagmask);
bool read_flags (lua_State *L, int index,
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);
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);
u32 read_flags_table(lua_State *L, int table,
FlagDesc *flagdesc, u32 *flagmask);
void push_items (lua_State *L,
const std::vector<ItemStack> &items);
void push_items(lua_State *L, const std::vector<ItemStack> &items);
std::vector<ItemStack> read_items (lua_State *L,
int index,
IGameDef* gdef);
std::vector<ItemStack> read_items(lua_State *L, int index, IGameDef* gdef);
void push_simplesoundspec (lua_State *L,
const SoundSpec &spec);
void push_simplesoundspec(lua_State *L, const SoundSpec &spec);
bool string_to_enum (const EnumString *spec,
int &result,
const std::string &str);
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);
bool read_noiseparams(lua_State *L, int index, NoiseParams *np);
void push_noiseparams(lua_State *L, NoiseParams *np);
bool read_tree_def (lua_State *L, int idx,
const NodeDefManager *ndef,
treegen::TreeDef &tree_def);
bool read_tree_def(lua_State *L, int idx,
const NodeDefManager *ndef, treegen::TreeDef &tree_def);
void luaentity_get (lua_State *L,u16 id);
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, u16 max_depth);
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, u16 max_depth);
/*!
* Pushes a Lua `pointed_thing` to the given Lua stack.
@ -195,13 +163,13 @@ void read_json_value (lua_State *L, Json::Value &root,
void push_pointed_thing(lua_State *L, const PointedThing &pointed, bool csm =
false, bool hitpoint = false);
void push_objectRef (lua_State *L, const u16 id);
void push_objectRef(lua_State *L, const u16 id);
void read_hud_element (lua_State *L, HudElement *elem);
void read_hud_element(lua_State *L, HudElement *elem);
void push_hud_element (lua_State *L, HudElement *elem);
void push_hud_element(lua_State *L, HudElement *elem);
bool read_hud_change (lua_State *L, HudElementStat &stat, HudElement *elem, void **value);
bool read_hud_change(lua_State *L, HudElementStat &stat, HudElement *elem, void **value);
void push_collision_move_result(lua_State *L, const collisionMoveResult &res);

121
src/script/common/c_converter.h
View file

@ -21,20 +21,19 @@ extern "C" {
#include <lua.h>
}
std::string getstringfield_default(lua_State *L, int table,
const char *fieldname, const std::string &default_);
bool getboolfield_default(lua_State *L, int table,
const char *fieldname, bool default_);
float getfloatfield_default(lua_State *L, int table,
const char *fieldname, float default_);
int getintfield_default(lua_State *L, int table,
const char *fieldname, int default_);
std::string getstringfield_default(lua_State *L, int table,
const char *fieldname, const std::string &default_);
bool getboolfield_default(lua_State *L, int table,
const char *fieldname, bool default_);
float getfloatfield_default(lua_State *L, int table,
const char *fieldname, float default_);
int getintfield_default(lua_State *L, int table,
const char *fieldname, int default_);
bool check_field_or_nil(lua_State *L, int index, int type, const char *fieldname);
template<typename T>
bool getintfield(lua_State *L, int table,
const char *fieldname, T &result)
bool getintfield(lua_State *L, int table, const char *fieldname, T &result)
{
lua_getfield(L, table, fieldname);
bool got = false;
@ -47,43 +46,41 @@ bool getintfield(lua_State *L, int table,
}
// Retrieve an v3s16 where all components are optional (falls back to default)
v3s16 getv3s16field_default(lua_State *L, int table,
const char *fieldname, v3s16 default_);
v3s16 getv3s16field_default(lua_State *L, int table,
const char *fieldname, v3s16 default_);
bool getstringfield(lua_State *L, int table,
const char *fieldname, std::string &result);
bool getstringfield(lua_State *L, int table,
const char *fieldname, std::string_view &result);
size_t getstringlistfield(lua_State *L, int table,
const char *fieldname,
std::vector<std::string> *result);
bool getboolfield(lua_State *L, int table,
const char *fieldname, bool &result);
bool getfloatfield(lua_State *L, int table,
const char *fieldname, float &result);
bool getstringfield(lua_State *L, int table,
const char *fieldname, std::string &result);
bool getstringfield(lua_State *L, int table,
const char *fieldname, std::string_view &result);
size_t getstringlistfield(lua_State *L, int table,
const char *fieldname, std::vector<std::string> *result);
bool getboolfield(lua_State *L, int table,
const char *fieldname, bool &result);
bool getfloatfield(lua_State *L, int table,
const char *fieldname, float &result);
void setstringfield(lua_State *L, int table,
const char *fieldname, const std::string &value);
void setintfield(lua_State *L, int table,
const char *fieldname, int value);
void setfloatfield(lua_State *L, int table,
const char *fieldname, float value);
void setboolfield(lua_State *L, int table,
const char *fieldname, bool value);
void setstringfield(lua_State *L, int table,
const char *fieldname, const std::string &value);
void setintfield(lua_State *L, int table,
const char *fieldname, int value);
void setfloatfield(lua_State *L, int table,
const char *fieldname, float value);
void setboolfield(lua_State *L, int table,
const char *fieldname, bool value);
v3f checkFloatPos (lua_State *L, int index);
v2f check_v2f (lua_State *L, int index);
v3f check_v3f (lua_State *L, int index);
v3s16 check_v3s16 (lua_State *L, int index);
v3f checkFloatPos(lua_State *L, int index);
v2f check_v2f(lua_State *L, int index);
v3f check_v3f(lua_State *L, int index);
v3s16 check_v3s16(lua_State *L, int index);
v3f read_v3f (lua_State *L, int index);
v2f read_v2f (lua_State *L, int index);
v2s16 read_v2s16 (lua_State *L, int index);
v2s32 read_v2s32 (lua_State *L, int index);
video::SColor read_ARGB8 (lua_State *L, int index);
bool read_color (lua_State *L, int index,
video::SColor *color);
bool is_color_table (lua_State *L, int index);
v3f read_v3f(lua_State *L, int index);
v2f read_v2f(lua_State *L, int index);
v2s16 read_v2s16(lua_State *L, int index);
v2s32 read_v2s32(lua_State *L, int index);
video::SColor read_ARGB8(lua_State *L, int index);
bool read_color(lua_State *L, int index, video::SColor *color);
bool is_color_table (lua_State *L, int index);
/**
* Read a floating-point axis-aligned box from Lua.
@ -96,32 +93,30 @@ bool is_color_table (lua_State *L, int index);
*
* @return the box corresponding to lua table
*/
aabb3f read_aabb3f (lua_State *L, int index, f32 scale);
aabb3f read_aabb3f(lua_State *L, int index, f32 scale);
v3s16 read_v3s16 (lua_State *L, int index);
v3s16 read_v3s16(lua_State *L, int index);
std::vector<aabb3f> read_aabb3f_vector (lua_State *L, int index, f32 scale);
size_t read_stringlist (lua_State *L, int index,
std::vector<std::string> *result);
size_t read_stringlist(lua_State *L, int index,
std::vector<std::string> *result);
void push_v2s16 (lua_State *L, v2s16 p);
void push_v2s32 (lua_State *L, v2s32 p);
void push_v2u32 (lua_State *L, v2u32 p);
void push_v3s16 (lua_State *L, v3s16 p);
void push_aabb3f (lua_State *L, aabb3f box, f32 divisor = 1.0f);
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_aabb3f_vector (lua_State *L, const std::vector<aabb3f> &boxes,
f32 divisor = 1.0f);
void push_v2s16(lua_State *L, v2s16 p);
void push_v2s32(lua_State *L, v2s32 p);
void push_v2u32(lua_State *L, v2u32 p);
void push_v3s16(lua_State *L, v3s16 p);
void push_aabb3f(lua_State *L, aabb3f box, f32 divisor = 1.0f);
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_aabb3f_vector(lua_State *L, const std::vector<aabb3f> &boxes,
f32 divisor = 1.0f);
void warn_if_field_exists(lua_State *L, int table,
const char *fieldname,
std::string_view name,
std::string_view message);
void warn_if_field_exists(lua_State *L, int table, const char *fieldname,
std::string_view name, std::string_view message);
size_t write_array_slice_float(lua_State *L, int table_index, float *data,
v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
// This must match the implementation in builtin/game/misc_s.lua
// Note that this returns a floating point result as Lua integers are 32-bit

4
src/script/lua_api/l_item.cpp
View file

@ -445,13 +445,13 @@ int LuaItemStack::l_equals(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o1 = checkObject<LuaItemStack>(L, 1);
// checks for non-userdata argument
// checks for non-userdata argument
if (!lua_isuserdata(L, 2)) {
lua_pushboolean(L, false);
return 1;
}
// check that the argument is an ItemStack
// check that the argument is an ItemStack
if (!lua_getmetatable(L, 2)) {
lua_pushboolean(L, false);
return 1;

36
src/script/lua_api/l_settings.cpp
View file

@ -182,16 +182,16 @@ int LuaSettings::l_get_flags(lua_State *L)
// get_pos(self, key) -> vector or nil
int LuaSettings::l_get_pos(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
std::optional<v3f> pos;
if (o->m_settings->getV3FNoEx(key, pos) && pos.has_value())
push_v3f(L, *pos);
else
lua_pushnil(L);
return 1;
std::optional<v3f> pos;
if (o->m_settings->getV3FNoEx(key, pos) && pos.has_value())
push_v3f(L, *pos);
else
lua_pushnil(L);
return 1;
}
// set(self, key, value)
@ -247,17 +247,17 @@ int LuaSettings::l_set_np_group(lua_State *L)
// set_pos(self, key, value)
int LuaSettings::l_set_pos(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
v3f value = check_v3f(L, 3);
std::string key = luaL_checkstring(L, 2);
v3f value = check_v3f(L, 3);
CHECK_SETTING_SECURITY(L, key);
CHECK_SETTING_SECURITY(L, key);
o->m_settings->setV3F(key, value);
o->m_settings->setV3F(key, value);
return 0;
return 0;
}
// remove(self, key) -> success
@ -389,11 +389,11 @@ const luaL_Reg LuaSettings::methods[] = {
luamethod(LuaSettings, get_bool),
luamethod(LuaSettings, get_np_group),
luamethod(LuaSettings, get_flags),
luamethod(LuaSettings, get_pos),
luamethod(LuaSettings, get_pos),
luamethod(LuaSettings, set),
luamethod(LuaSettings, set_bool),
luamethod(LuaSettings, set_np_group),
luamethod(LuaSettings, set_pos),
luamethod(LuaSettings, set_pos),
luamethod(LuaSettings, remove),
luamethod(LuaSettings, get_names),
luamethod(LuaSettings, has),

8
src/script/lua_api/l_settings.h
View file

@ -29,8 +29,8 @@ private:
// get_flags(self, key) -> key/value table
static int l_get_flags(lua_State *L);
// get_pos(self, key) -> vector or nil
static int l_get_pos(lua_State *L);
// get_pos(self, key) -> vector or nil
static int l_get_pos(lua_State *L);
// set(self, key, value)
static int l_set(lua_State *L);
@ -41,8 +41,8 @@ private:
// set_np_group(self, key, value)
static int l_set_np_group(lua_State *L);
// set_pos(self, key, value)
static int l_set_pos(lua_State *L);
// set_pos(self, key, value)
static int l_set_pos(lua_State *L);
// remove(self, key) -> success
static int l_remove(lua_State *L);