minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove unused m_wielded_item_not_sent

This commit is contained in:
Loic Blot 2015-03-03 17:36:54 +01:00
parent 7e56637ed0
commit 038d3a31df
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/content_sao.cpp
View File

@ -718,7 +718,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
// public // public
m_moved(false), m_moved(false),
m_inventory_not_sent(false), m_inventory_not_sent(false),
m_wielded_item_not_sent(false),
m_physics_override_speed(1), m_physics_override_speed(1),
m_physics_override_jump(1), m_physics_override_jump(1),
m_physics_override_gravity(1), m_physics_override_gravity(1),
@ -924,13 +923,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
m_messages_out.push_back(aom); m_messages_out.push_back(aom);
} }
if(m_wielded_item_not_sent) if(m_armor_groups_sent == false) {
{
m_wielded_item_not_sent = false;
// GenericCAO has no special way to show this
}
if(m_armor_groups_sent == false){
m_armor_groups_sent = true; m_armor_groups_sent = true;
std::string str = gob_cmd_update_armor_groups( std::string str = gob_cmd_update_armor_groups(
m_armor_groups); m_armor_groups);
@ -1186,10 +1179,8 @@ int PlayerSAO::getWieldIndex() const
void PlayerSAO::setWieldIndex(int i) void PlayerSAO::setWieldIndex(int i)
{ {
if(i != m_wield_index) if(i != m_wield_index) {
{
m_wield_index = i; m_wield_index = i;
m_wielded_item_not_sent = true;
} }
} }

1
src/content_sao.h
View File

@ -318,7 +318,6 @@ public:
// Some flags used by Server // Some flags used by Server
bool m_moved; bool m_moved;
bool m_inventory_not_sent; bool m_inventory_not_sent;
bool m_wielded_item_not_sent;
float m_physics_override_speed; float m_physics_override_speed;
float m_physics_override_jump; float m_physics_override_jump;

1
src/server.cpp
View File

@ -1386,7 +1386,6 @@ void Server::setInventoryModified(const InventoryLocation &loc)
if(!playersao) if(!playersao)
return; return;
playersao->m_inventory_not_sent = true; playersao->m_inventory_not_sent = true;
playersao->m_wielded_item_not_sent = true;
} }
break; break;
case InventoryLocation::NODEMETA: case InventoryLocation::NODEMETA: