Rename CSM flavours to restrictions

& Satisfy LINT

5 files changed, 17 insertions, 17 deletions

diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp
index 9962de46a..923a92d32 100644
--- a/src/network/clientopcodes.cpp
+++ b/src/network/clientopcodes.cpp
@@ -66,7 +66,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
 	{ "TOCLIENT_INVENTORY",                TOCLIENT_STATE_CONNECTED, &Client::handleCommand_Inventory }, // 0x27
 	null_command_handler,
 	{ "TOCLIENT_TIME_OF_DAY",              TOCLIENT_STATE_CONNECTED, &Client::handleCommand_TimeOfDay }, // 0x29
-	{ "TOCLIENT_CSM_FLAVOUR_LIMITS",       TOCLIENT_STATE_CONNECTED, &Client::handleCommand_CSMFlavourLimits }, // 0x2A
+	{ "TOCLIENT_CSM_RESTRICTION_FLAGS",    TOCLIENT_STATE_CONNECTED, &Client::handleCommand_CSMRestrictionFlags }, // 0x2A
 	null_command_handler,
 	null_command_handler,
 	null_command_handler,
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index bc1f18ae8..f8be61317 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1333,11 +1333,11 @@ void Client::handleCommand_FormspecPrepend(NetworkPacket *pkt)
 	*pkt >> player->formspec_prepend;
 }
 
-void Client::handleCommand_CSMFlavourLimits(NetworkPacket *pkt)
+void Client::handleCommand_CSMRestrictionFlags(NetworkPacket *pkt)
 {
-	*pkt >> m_csm_flavour_limits >> m_csm_noderange_limit;
+	*pkt >> m_csm_restriction_flags >> m_csm_restriction_noderange;
 
-	// Now we have flavours, load mods if it's enabled
+	// Restrictions were received -> load mods if it's enabled
 	// Note: this should be moved after mods receptions from server instead
 	loadMods();
 }
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 0a5701e59..3d682a0ad 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -169,7 +169,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  			* sender
  			* type (RAW, NORMAL, ANNOUNCE, SYSTEM)
  			* content
- 		Add TOCLIENT_CSM_FLAVOUR_LIMITS to define which CSM flavour should be
+		Add TOCLIENT_CSM_RESTRICTION_FLAGS to define which CSM features should be
 			limited
 		Add settable player collisionbox. Breaks compatibility with older
 			clients as a 1-node vertical offset has been removed from player's
@@ -283,9 +283,9 @@ enum ToClientCommand
 		f1000 time_speed
 	*/
 
-	TOCLIENT_CSM_FLAVOUR_LIMITS = 0x2A,
+	TOCLIENT_CSM_RESTRICTION_FLAGS = 0x2A,
 	/*
-		u32 CSMFlavourLimits byteflag
+		u32 CSMRestrictionFlags byteflag
 	 */
 
 	// (oops, there is some gap here)
@@ -928,12 +928,12 @@ enum PlayerListModifer: u8
 	PLAYER_LIST_REMOVE,
 };
 
-enum CSMFlavourLimit : u64 {
-	CSM_FL_NONE = 0x00000000,
-	CSM_FL_LOAD_CLIENT_MODS = 0x00000001, // Disable mods provided by clients
-	CSM_FL_CHAT_MESSAGES = 0x00000002, // Disable chat message sending from CSM
-	CSM_FL_READ_ITEMDEFS = 0x00000004, // Disable itemdef lookups
-	CSM_FL_READ_NODEDEFS = 0x00000008, // Disable nodedef lookups
-	CSM_FL_LOOKUP_NODES = 0x00000010, // Limit node lookups
-	CSM_FL_ALL = 0xFFFFFFFF,
+enum CSMRestrictionFlags : u64 {
+	CSM_RF_NONE = 0x00000000,
+	CSM_RF_LOAD_CLIENT_MODS = 0x00000001, // Disable mods provided by clients
+	CSM_RF_CHAT_MESSAGES = 0x00000002, // Disable chat message sending from CSM
+	CSM_RF_READ_ITEMDEFS = 0x00000004, // Disable itemdef lookups
+	CSM_RF_READ_NODEDEFS = 0x00000008, // Disable nodedef lookups
+	CSM_RF_LOOKUP_NODES = 0x00000010, // Limit node lookups
+	CSM_RF_ALL = 0xFFFFFFFF,
 };
diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp
index 883ff9d10..e4e313611 100644
--- a/src/network/serveropcodes.cpp
+++ b/src/network/serveropcodes.cpp
@@ -155,7 +155,7 @@ const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] =
 	{ "TOCLIENT_INVENTORY",                0, true }, // 0x27
 	null_command_factory,
 	{ "TOCLIENT_TIME_OF_DAY",              0, true }, // 0x29
-	{ "TOCLIENT_CSM_FLAVOUR_LIMITS",       0, true }, // 0x2A
+	{ "TOCLIENT_CSM_RESTRICTION_FLAGS",    0, true }, // 0x2A
 	null_command_factory,
 	null_command_factory,
 	null_command_factory,
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index bb5eed92b..4647bcc04 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -320,7 +320,7 @@ void Server::handleCommand_Init2(NetworkPacket* pkt)
 	float time_speed = g_settings->getFloat("time_speed");
 	SendTimeOfDay(pkt->getPeerId(), time, time_speed);
 
-	SendCSMFlavourLimits(pkt->getPeerId());
+	SendCSMRestrictionFlags(pkt->getPeerId());
 
 	// Warnings about protocol version can be issued here
 	if (getClient(pkt->getPeerId())->net_proto_version < LATEST_PROTOCOL_VERSION) {