Skip to content
Permalink
Browse files

Drop ClientEvent CEE_PLAYER_BREATH: triggering function is not called.

Also drop 3 useless IntervalLimiter
  • Loading branch information...
nerzhul committed Jul 1, 2018
1 parent 49509d2 commit 1ff15d3a46042d3432d9485249e4dc3b08dbc6ff
Showing with 2 additions and 21 deletions.
  1. +1 −12 src/clientenvironment.cpp
  2. +1 −9 src/clientenvironment.h
@@ -203,10 +203,7 @@ void ClientEnvironment::step(float dtime)
lplayer->move(dtime_part, this, position_max_increment,
&player_collisions);
}
}
while(dtime_downcount > 0.001);

//std::cout<<"Looped "<<loopcount<<" times."<<std::endl;
} while (dtime_downcount > 0.001);

bool player_immortal = lplayer->getCAO() && lplayer->getCAO()->isImmortal();

@@ -483,14 +480,6 @@ void ClientEnvironment::damageLocalPlayer(u8 damage, bool handle_hp)
m_client_event_queue.push(event);
}

void ClientEnvironment::updateLocalPlayerBreath(u16 breath)
{
ClientEnvEvent event;
event.type = CEE_PLAYER_BREATH;
event.player_breath.amount = breath;
m_client_event_queue.push(event);
}

/*
Client likes to call these
*/
@@ -42,8 +42,7 @@ class LocalPlayer;
enum ClientEnvEventType
{
CEE_NONE,
CEE_PLAYER_DAMAGE,
CEE_PLAYER_BREATH
CEE_PLAYER_DAMAGE
};

struct ClientEnvEvent
@@ -56,9 +55,6 @@ struct ClientEnvEvent
u8 amount;
bool send_to_server;
} player_damage;
struct{
u16 amount;
} player_breath;
};
};

@@ -113,7 +109,6 @@ class ClientEnvironment : public Environment
*/

void damageLocalPlayer(u8 damage, bool handle_hp=true);
void updateLocalPlayerBreath(u16 breath);

/*
Client likes to call these
@@ -151,9 +146,6 @@ class ClientEnvironment : public Environment
std::vector<ClientSimpleObject*> m_simple_objects;
std::queue<ClientEnvEvent> m_client_event_queue;
IntervalLimiter m_active_object_light_update_interval;
IntervalLimiter m_lava_hurt_interval;
IntervalLimiter m_drowning_interval;
IntervalLimiter m_breathing_interval;
std::list<std::string> m_player_names;
v3s16 m_camera_offset;
};

0 comments on commit 1ff15d3

Please sign in to comment.
You can’t perform that action at this time.