From f2e62298a5b204045f01e399e78eb84072df967a Mon Sep 17 00:00:00 2001
From: random-geek <35757396+random-geek@users.noreply.github.com>
Date: Tue, 29 Oct 2019 11:23:12 -0700
Subject: Change some usages of "deprecated" to "obsolete" (#9062)

"Deprecated" means that something is still in use, but is unsupported and needs to be removed.
"Obsolete" means it is already out of use.
---
 src/activeobject.h              |  4 ++--
 src/content_sao.cpp             |  2 +-
 src/mapgen/mapgen.h             |  4 ++--
 src/script/common/c_content.cpp | 16 ++++++++--------
 src/script/lua_api/l_mapgen.cpp |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/activeobject.h b/src/activeobject.h
index a319ef904..4a2de92cd 100644
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -27,13 +27,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 enum ActiveObjectType {
 	ACTIVEOBJECT_TYPE_INVALID = 0,
 	ACTIVEOBJECT_TYPE_TEST = 1,
-// Deprecated stuff
+// Obsolete stuff
 	ACTIVEOBJECT_TYPE_ITEM = 2,
 //	ACTIVEOBJECT_TYPE_RAT = 3,
 //	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
 //	ACTIVEOBJECT_TYPE_FIREFLY = 5,
 	ACTIVEOBJECT_TYPE_MOBV2 = 6,
-// End deprecated stuff
+// End obsolete stuff
 	ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
 	ACTIVEOBJECT_TYPE_PLAYER = 100,
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 87e6466a9..ebda0efc9 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -985,7 +985,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 
 void PlayerSAO::getStaticData(std::string * result) const
 {
-	FATAL_ERROR("Deprecated function");
+	FATAL_ERROR("Obsolete function");
 }
 
 void PlayerSAO::step(float dtime, bool send_recommended)
diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 0ac26d538..f7697cab4 100644
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -30,10 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01  // Deprecated. Moved into mgv6 flags
+#define MG_TREES       0x01  // Obsolete. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08  // Deprecated. Moved into mgv6 flags
+#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 cb0253c32..72142798e 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -83,7 +83,7 @@ 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",
-			"Deprecated; use tool_capabilities");
+			"Obsolete; use tool_capabilities");
 
 	lua_getfield(L, index, "tool_capabilities");
 	if(lua_istable(L, -1)){
@@ -643,19 +643,19 @@ ContentFeatures read_content_features(lua_State *L, int index)
 		warningstream << "Node " << f.name.c_str()
 			<< " has a palette, but not a suitable paramtype2." << std::endl;
 
-	// Warn about some deprecated fields
+	// Warn about some obsolete fields
 	warn_if_field_exists(L, index, "wall_mounted",
-			"Deprecated; use paramtype2 = 'wallmounted'");
+			"Obsolete; use paramtype2 = 'wallmounted'");
 	warn_if_field_exists(L, index, "light_propagates",
-			"Deprecated; determined from paramtype");
+			"Obsolete; determined from paramtype");
 	warn_if_field_exists(L, index, "dug_item",
-			"Deprecated; use 'drop' field");
+			"Obsolete; use 'drop' field");
 	warn_if_field_exists(L, index, "extra_dug_item",
-			"Deprecated; use 'drop' field");
+			"Obsolete; use 'drop' field");
 	warn_if_field_exists(L, index, "extra_dug_item_rarity",
-			"Deprecated; use 'drop' field");
+			"Obsolete; use 'drop' field");
 	warn_if_field_exists(L, index, "metadata_name",
-			"Deprecated; use on_add and metadata callbacks");
+			"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);
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 2e0cba8dd..cb0d6ac95 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -879,7 +879,7 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
 		settingsmgr->setMapSetting("chunksize", readParam<std::string>(L, -1), true);
 
 	warn_if_field_exists(L, 1, "flagmask",
-		"Deprecated: flags field now includes unset flags.");
+		"Obsolete: flags field now includes unset flags.");
 
 	lua_getfield(L, 1, "flags");
 	if (lua_isstring(L, -1))
-- 
cgit v1.2.3