From: Loic Blot <loic.blot@unix-experience.fr>
Date: Tue, 3 Mar 2015 16:36:54 +0000 (+0100)
Subject: Remove unused m_wielded_item_not_sent
X-Git-Tag: 0.4.13~549
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f;p=oweals%2Fminetest.git

Remove unused m_wielded_item_not_sent
---

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 26b721d39..0600689e4 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -718,7 +718,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	// public
 	m_moved(false),
 	m_inventory_not_sent(false),
-	m_wielded_item_not_sent(false),
 	m_physics_override_speed(1),
 	m_physics_override_jump(1),
 	m_physics_override_gravity(1),
@@ -924,13 +923,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 		m_messages_out.push_back(aom);
 	}
 
-	if(m_wielded_item_not_sent)
-	{
-		m_wielded_item_not_sent = false;
-		// GenericCAO has no special way to show this
-	}
-
-	if(m_armor_groups_sent == false){
+	if(m_armor_groups_sent == false) {
 		m_armor_groups_sent = true;
 		std::string str = gob_cmd_update_armor_groups(
 				m_armor_groups);
@@ -1186,10 +1179,8 @@ int PlayerSAO::getWieldIndex() const
 
 void PlayerSAO::setWieldIndex(int i)
 {
-	if(i != m_wield_index)
-	{
+	if(i != m_wield_index) {
 		m_wield_index = i;
-		m_wielded_item_not_sent = true;
 	}
 }
 
diff --git a/src/content_sao.h b/src/content_sao.h
index d6a494ae2..6b7304944 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -318,7 +318,6 @@ public:
 	// Some flags used by Server
 	bool m_moved;
 	bool m_inventory_not_sent;
-	bool m_wielded_item_not_sent;
 
 	float m_physics_override_speed;
 	float m_physics_override_jump;
diff --git a/src/server.cpp b/src/server.cpp
index 84a8df4b8..cafeb951d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1386,7 +1386,6 @@ void Server::setInventoryModified(const InventoryLocation &loc)
 		if(!playersao)
 			return;
 		playersao->m_inventory_not_sent = true;
-		playersao->m_wielded_item_not_sent = true;
 	}
 		break;
 	case InventoryLocation::NODEMETA: