forked from Mirrorlandia_minetest/minetest
Removed some obsolete code (#10562)
Co-authored-by: Zughy <4279489-marco_a@users.noreply.gitlab.com>
This commit is contained in:
parent
ea5d6312c1
commit
45ccfe26fb
@ -1,28 +1,5 @@
|
|||||||
-- Minetest: builtin/deprecated.lua
|
-- Minetest: builtin/deprecated.lua
|
||||||
|
|
||||||
--
|
|
||||||
-- Default material types
|
|
||||||
--
|
|
||||||
local function digprop_err()
|
|
||||||
core.log("deprecated", "The core.digprop_* functions are obsolete and need to be replaced by item groups.")
|
|
||||||
end
|
|
||||||
|
|
||||||
core.digprop_constanttime = digprop_err
|
|
||||||
core.digprop_stonelike = digprop_err
|
|
||||||
core.digprop_dirtlike = digprop_err
|
|
||||||
core.digprop_gravellike = digprop_err
|
|
||||||
core.digprop_woodlike = digprop_err
|
|
||||||
core.digprop_leaveslike = digprop_err
|
|
||||||
core.digprop_glasslike = digprop_err
|
|
||||||
|
|
||||||
function core.node_metadata_inventory_move_allow_all()
|
|
||||||
core.log("deprecated", "core.node_metadata_inventory_move_allow_all is obsolete and does nothing.")
|
|
||||||
end
|
|
||||||
|
|
||||||
function core.add_to_creative_inventory(itemstring)
|
|
||||||
core.log("deprecated", "core.add_to_creative_inventory is obsolete and does nothing.")
|
|
||||||
end
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- EnvRef
|
-- EnvRef
|
||||||
--
|
--
|
||||||
@ -77,7 +54,7 @@ core.setting_save = setting_proxy("write")
|
|||||||
|
|
||||||
function core.register_on_auth_fail(func)
|
function core.register_on_auth_fail(func)
|
||||||
core.log("deprecated", "core.register_on_auth_fail " ..
|
core.log("deprecated", "core.register_on_auth_fail " ..
|
||||||
"is obsolete and should be replaced by " ..
|
"is deprecated and should be replaced by " ..
|
||||||
"core.register_on_authplayer instead.")
|
"core.register_on_authplayer instead.")
|
||||||
|
|
||||||
core.register_on_authplayer(function (player_name, ip, is_success)
|
core.register_on_authplayer(function (player_name, ip, is_success)
|
||||||
|
@ -705,10 +705,6 @@ core.nodedef_default = {
|
|||||||
|
|
||||||
on_receive_fields = nil,
|
on_receive_fields = nil,
|
||||||
|
|
||||||
on_metadata_inventory_move = core.node_metadata_inventory_move_allow_all,
|
|
||||||
on_metadata_inventory_offer = core.node_metadata_inventory_offer_allow_all,
|
|
||||||
on_metadata_inventory_take = core.node_metadata_inventory_take_allow_all,
|
|
||||||
|
|
||||||
-- Node properties
|
-- Node properties
|
||||||
drawtype = "normal",
|
drawtype = "normal",
|
||||||
visual_scale = 1.0,
|
visual_scale = 1.0,
|
||||||
|
@ -324,13 +324,6 @@ for name in pairs(forbidden_item_names) do
|
|||||||
register_alias_raw(name, "")
|
register_alias_raw(name, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
-- Obsolete:
|
|
||||||
-- Aliases for core.register_alias (how ironic...)
|
|
||||||
-- core.alias_node = core.register_alias
|
|
||||||
-- core.alias_tool = core.register_alias
|
|
||||||
-- core.alias_craftitem = core.register_alias
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Built-in node definitions. Also defined in C.
|
-- Built-in node definitions. Also defined in C.
|
||||||
--
|
--
|
||||||
|
@ -493,19 +493,8 @@ Static objects are persistent freely moving objects in the world.
|
|||||||
|
|
||||||
Object types:
|
Object types:
|
||||||
1: Test object
|
1: Test object
|
||||||
2: Item
|
|
||||||
3: Rat (obsolete)
|
|
||||||
4: Oerkki (obsolete)
|
|
||||||
5: Firefly (obsolete)
|
|
||||||
6: MobV2 (obsolete)
|
|
||||||
7: LuaEntity
|
7: LuaEntity
|
||||||
|
|
||||||
1: Item:
|
|
||||||
u8 version
|
|
||||||
version 0:
|
|
||||||
u16 len
|
|
||||||
u8[len] itemstring
|
|
||||||
|
|
||||||
7: LuaEntity:
|
7: LuaEntity:
|
||||||
u8 compatibility_byte (always 1)
|
u8 compatibility_byte (always 1)
|
||||||
u16 len
|
u16 len
|
||||||
|
@ -28,11 +28,11 @@ enum ActiveObjectType {
|
|||||||
ACTIVEOBJECT_TYPE_INVALID = 0,
|
ACTIVEOBJECT_TYPE_INVALID = 0,
|
||||||
ACTIVEOBJECT_TYPE_TEST = 1,
|
ACTIVEOBJECT_TYPE_TEST = 1,
|
||||||
// Obsolete stuff
|
// Obsolete stuff
|
||||||
ACTIVEOBJECT_TYPE_ITEM = 2,
|
// ACTIVEOBJECT_TYPE_ITEM = 2,
|
||||||
// ACTIVEOBJECT_TYPE_RAT = 3,
|
// ACTIVEOBJECT_TYPE_RAT = 3,
|
||||||
// ACTIVEOBJECT_TYPE_OERKKI1 = 4,
|
// ACTIVEOBJECT_TYPE_OERKKI1 = 4,
|
||||||
// ACTIVEOBJECT_TYPE_FIREFLY = 5,
|
// ACTIVEOBJECT_TYPE_FIREFLY = 5,
|
||||||
ACTIVEOBJECT_TYPE_MOBV2 = 6,
|
// ACTIVEOBJECT_TYPE_MOBV2 = 6,
|
||||||
// End obsolete stuff
|
// End obsolete stuff
|
||||||
ACTIVEOBJECT_TYPE_LUAENTITY = 7,
|
ACTIVEOBJECT_TYPE_LUAENTITY = 7,
|
||||||
// Special type, not stored as a static object
|
// Special type, not stored as a static object
|
||||||
|
@ -30,10 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#define MAPGEN_DEFAULT_NAME "v7"
|
#define MAPGEN_DEFAULT_NAME "v7"
|
||||||
|
|
||||||
/////////////////// Mapgen flags
|
/////////////////// Mapgen flags
|
||||||
#define MG_TREES 0x01 // Obsolete. Moved into mgv6 flags
|
|
||||||
#define MG_CAVES 0x02
|
#define MG_CAVES 0x02
|
||||||
#define MG_DUNGEONS 0x04
|
#define MG_DUNGEONS 0x04
|
||||||
#define MG_FLAT 0x08 // Obsolete. Moved into mgv6 flags
|
|
||||||
#define MG_LIGHT 0x10
|
#define MG_LIGHT 0x10
|
||||||
#define MG_DECORATIONS 0x20
|
#define MG_DECORATIONS 0x20
|
||||||
#define MG_BIOMES 0x40
|
#define MG_BIOMES 0x40
|
||||||
|
@ -83,9 +83,6 @@ void read_item_definition(lua_State* L, int index,
|
|||||||
|
|
||||||
getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
|
getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
|
||||||
|
|
||||||
warn_if_field_exists(L, index, "tool_digging_properties",
|
|
||||||
"Obsolete; use tool_capabilities");
|
|
||||||
|
|
||||||
lua_getfield(L, index, "tool_capabilities");
|
lua_getfield(L, index, "tool_capabilities");
|
||||||
if(lua_istable(L, -1)){
|
if(lua_istable(L, -1)){
|
||||||
def.tool_capabilities = new ToolCapabilities(
|
def.tool_capabilities = new ToolCapabilities(
|
||||||
@ -653,20 +650,6 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
|
|||||||
warningstream << "Node " << f.name.c_str()
|
warningstream << "Node " << f.name.c_str()
|
||||||
<< " has a palette, but not a suitable paramtype2." << std::endl;
|
<< " has a palette, but not a suitable paramtype2." << std::endl;
|
||||||
|
|
||||||
// Warn about some obsolete fields
|
|
||||||
warn_if_field_exists(L, index, "wall_mounted",
|
|
||||||
"Obsolete; use paramtype2 = 'wallmounted'");
|
|
||||||
warn_if_field_exists(L, index, "light_propagates",
|
|
||||||
"Obsolete; determined from paramtype");
|
|
||||||
warn_if_field_exists(L, index, "dug_item",
|
|
||||||
"Obsolete; use 'drop' field");
|
|
||||||
warn_if_field_exists(L, index, "extra_dug_item",
|
|
||||||
"Obsolete; use 'drop' field");
|
|
||||||
warn_if_field_exists(L, index, "extra_dug_item_rarity",
|
|
||||||
"Obsolete; use 'drop' field");
|
|
||||||
warn_if_field_exists(L, index, "metadata_name",
|
|
||||||
"Obsolete; use on_add and metadata callbacks");
|
|
||||||
|
|
||||||
// True for all ground-like things like stone and mud, false for eg. trees
|
// True for all ground-like things like stone and mud, false for eg. trees
|
||||||
getboolfield(L, index, "is_ground_content", f.is_ground_content);
|
getboolfield(L, index, "is_ground_content", f.is_ground_content);
|
||||||
f.light_propagates = (f.param_type == CPT_LIGHT);
|
f.light_propagates = (f.param_type == CPT_LIGHT);
|
||||||
|
@ -873,9 +873,6 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
|
|||||||
if (lua_isnumber(L, -1))
|
if (lua_isnumber(L, -1))
|
||||||
settingsmgr->setMapSetting("chunksize", readParam<std::string>(L, -1), true);
|
settingsmgr->setMapSetting("chunksize", readParam<std::string>(L, -1), true);
|
||||||
|
|
||||||
warn_if_field_exists(L, 1, "flagmask",
|
|
||||||
"Obsolete: flags field now includes unset flags.");
|
|
||||||
|
|
||||||
lua_getfield(L, 1, "flags");
|
lua_getfield(L, 1, "flags");
|
||||||
if (lua_isstring(L, -1))
|
if (lua_isstring(L, -1))
|
||||||
settingsmgr->setMapSetting("mg_flags", readParam<std::string>(L, -1), true);
|
settingsmgr->setMapSetting("mg_flags", readParam<std::string>(L, -1), true);
|
||||||
|
@ -148,7 +148,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
|
|||||||
|
|
||||||
void PlayerSAO::getStaticData(std::string * result) const
|
void PlayerSAO::getStaticData(std::string * result) const
|
||||||
{
|
{
|
||||||
FATAL_ERROR("Obsolete function");
|
FATAL_ERROR("This function shall not be called for PlayerSAO");
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerSAO::step(float dtime, bool send_recommended)
|
void PlayerSAO::step(float dtime, bool send_recommended)
|
||||||
|
Loading…
Reference in New Issue
Block a user