Removed some obsolete code (#10562)

Co-authored-by: Zughy <4279489-marco_a@users.noreply.gitlab.com>

5 files changed, 6 insertions, 28 deletions

diff --git a/src/activeobject.h b/src/activeobject.h
index 0829858ad..1d8a3712b 100644
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -28,11 +28,11 @@ enum ActiveObjectType {
 	ACTIVEOBJECT_TYPE_INVALID = 0,
 	ACTIVEOBJECT_TYPE_TEST = 1,
 // Obsolete stuff
-	ACTIVEOBJECT_TYPE_ITEM = 2,
-//	ACTIVEOBJECT_TYPE_RAT = 3,
-//	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
-//	ACTIVEOBJECT_TYPE_FIREFLY = 5,
-	ACTIVEOBJECT_TYPE_MOBV2 = 6,
+// ACTIVEOBJECT_TYPE_ITEM = 2,
+// ACTIVEOBJECT_TYPE_RAT = 3,
+// ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+// ACTIVEOBJECT_TYPE_FIREFLY = 5,
+// ACTIVEOBJECT_TYPE_MOBV2 = 6,
 // End obsolete stuff
 	ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 1487731e2..61db4f3b9 100644
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -30,10 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01  // Obsolete. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08  // Obsolete. Moved into mgv6 flags
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 #define MG_BIOMES      0x40
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index e3cb9042e..4316f412d 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -83,9 +83,6 @@ void read_item_definition(lua_State* L, int index,
 
 	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");
 	if(lua_istable(L, -1)){
 		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()
 			<< " 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
 	getboolfield(L, index, "is_ground_content", f.is_ground_content);
 	f.light_propagates = (f.param_type == CPT_LIGHT);
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 834938e56..498859f14 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -873,9 +873,6 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
 	if (lua_isnumber(L, -1))
 		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");
 	if (lua_isstring(L, -1))
 		settingsmgr->setMapSetting("mg_flags", readParam<std::string>(L, -1), true);
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index c1b1401e6..110d2010d 100644
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -148,7 +148,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 
 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)